Merge pull request #2469 from dsdstudio/master

[#2469] NullPointerException in AbstractResultQuery.fetchOneMap()
2013-05-20 11:33:11 -07:00 · 2013-05-20 11:33:11 -07:00 · 5967c8a6e9
commit 5967c8a6e9
parent 2cedb6c07a fc99bb2fb6
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
@ -554,7 +554,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