Merge branch 'master' of git@github.com:jOOQ/jOOQ.git

2013-05-20 20:34:39 +02:00 · 2013-05-20 20:34:39 +02:00 · bd8a96714d
commit bd8a96714d
parent f1754f5ffa 5967c8a6e9
1 changed files with 2 additions and 1 deletions
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@ -562,7 +562,8 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple

    @Override
    public final Map<String, Object> fetchOneMap() {
-        return fetchOne().intoMap();
+		R record = fetchOne();
+		return record == null ? null : record.intoMap();
    }

    @Override