From fc99bb2fb62bb01a0f65640bde3ada624998c90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=87=E1=85=A9=E1=84=85=E1=85=A9=E1=86=BC=E1=84=8F?=
 =?UTF-8?q?=E1=85=B5=E1=86=B7?= <dsdgun@gmail.com>
Date: Mon, 20 May 2013 00:52:07 +0900
Subject: [PATCH] fix AbstractResultQuery.fetchOneMap() NPE bug

---
 jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index 741294e4b2..7ba650d138 100644
--- 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