From 483bc3f37555681e76bbe4492845da400b14bec3 Mon Sep 17 00:00:00 2001
From: Markus Junginger <markus@greenrobot>
Date: Mon, 13 Feb 2012 20:04:15 +0100
Subject: [PATCH] Additional check that key can be acquired (issue #5)

---
 .../src/de/greenrobot/dao/AbstractDao.java    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/DaoCore/src/de/greenrobot/dao/AbstractDao.java b/DaoCore/src/de/greenrobot/dao/AbstractDao.java
index 4503b1c2c..363ce2359 100644
--- a/DaoCore/src/de/greenrobot/dao/AbstractDao.java
+++ b/DaoCore/src/de/greenrobot/dao/AbstractDao.java
@@ -153,7 +153,8 @@ public List<T> loadAll() {
     /** Detaches an entity from the identity scope (session). Subsequent query results won't return this object. */
     public boolean detach(T entity) {
         if (identityScope != null) {
-            return identityScope.detach(getKey(entity), entity);
+            K key = getKeyVerified(entity);
+            return identityScope.detach(key, entity);
         } else {
             return false;
         }
@@ -379,7 +380,7 @@ public void deleteAll() {
     /** Deletes the given entity from the database. Currently, only single value PK entities are supported. */
     public void delete(T entity) {
         assertSinglePk();
-        K key = getKey(entity);
+        K key = getKeyVerified(entity);
         deleteByKey(key);
         if (identityScope != null) {
             identityScope.remove(key);
@@ -406,7 +407,7 @@ public void deleteByKey(K key) {
     /** Resets all locally changed properties of the entity by reloading the values from the database. */
     public void refresh(T entity) {
         assertSinglePk();
-        K key = getKey(entity);
+        K key = getKeyVerified(entity);
         String sql = statements.getSelectByKey();
         String[] keyArray = new String[] { key.toString() };
         Cursor cursor = db.rawQuery(sql, keyArray);
@@ -521,6 +522,20 @@ public long count() {
         return DatabaseUtils.queryNumEntries(db, '\'' + config.tablename + '\'');
     }
 
+    /** See {@link #getKey(Object)}, but guarantees that the returned key is never null (throws if null). */
+    protected K getKeyVerified(T entity) {
+        K key = getKey(entity);
+        if (key == null) {
+            if (entity == null) {
+                throw new NullPointerException("Entity may not be null");
+            } else {
+                throw new DaoException("Entity has no key");
+            }
+        } else {
+            return key;
+        }
+    }
+
     /** Reads the values from the current position of the given cursor and returns a new entity. */
     abstract protected T readEntity(Cursor cursor, int offset);