From 490478cd38fe5354ced782135af2fa5b4ba482b7 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 30 Aug 2012 18:39:19 +0200
Subject: [PATCH] [#1768] NullPointerException when DAO.fetchOne() returns no
 record

---
 jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java | 4 ++++
 jOOQ/src/main/java/org/jooq/impl/DAOImpl.java         | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
index 2629aaa3d7..aeb897dd12 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DaoTests.java
@@ -94,6 +94,10 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
         assertEquals(2, TAuthorDao().count());
         assertEquals(2, TAuthorDao().findAll().size());
 
+        // [#1768] Unknown records should return null
+        assertNull(TAuthorDao().findById(3));
+        assertNull(TAuthorDao().fetchOne(TAuthor_ID(), 3));
+
         AP id1 = TAuthorDao().findById(1);
         assertEquals(1, on(id1).get("id"));
         assertEquals("George", on(id1).get("firstName"));
diff --git a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
index 23efb826a9..e55e173e07 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
@@ -222,10 +222,11 @@ public abstract class DAOImpl<R extends UpdatableRecord<R>, P, T> implements DAO
 
     @Override
     public final <Z> P fetchOne(Field<Z> field, Z value) {
-        return create.selectFrom(table)
-                     .where(field.equal(value))
-                     .fetchOne()
-                     .into(type);
+        R record = create.selectFrom(table)
+                         .where(field.equal(value))
+                         .fetchOne();
+
+        return record == null ? null : record.into(type);
     }
 
     @Override