Changeset 5059

Timestamp:

Aug 19, 2009, 8:09:38 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

• Fixes a NullPointerException? that prevent annotated items from being deleted.

File:

• trunk/src/core/net/sf/basedb/core/log/db/AnnotationLogger.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/log/db/AnnotationLogger.java

@@ -79 +79 @@
     // Get the type of the parent item
     AnnotationSetData as = annotation.getAnnotationSet();
-    int itemType = 0;
+    Integer itemType = null;
     if (!Hibernate.isInitialized(as))
     {
@@ -92 +92 @@
     }
     
+    // May happen in case the annotation set has been deleted in this transaction
+    if (itemType == null) return;
+    
     // Get the id of the parent item
     String parentClass = Item.fromValue(itemType).getDataClass().getName();
@@ -97 +100 @@
       PredefinedQuery.getQueryString("DBLOG_GET_ITEMID_WITH_ANNOTATION", parentClass));
     q.setInteger("annotationSetId", as.getId());
-    int parentId = (Integer)q.uniqueResult();
+    Integer parentId = (Integer)q.uniqueResult();
+    
+    // May happen in case the parent item has been deleted in this transaction
+    if (parentId == null) return;
     
     ChangeHistoryDetailData change = new ChangeHistoryDetailData();