Changeset 7124

Timestamp:

Apr 20, 2016, 8:12:54 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2000: Batch API for annotation handling

Fixes a NullPointerException when updating and unit is null.

File:

• trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java (modified) (6 diffs)

trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java

@@ -653 +653 @@
             
             // Update last_update, unit, version in Annotations
-            updateAnnotations.addToBatch(info.version+1, unit != null ? unit.getId() : info.unitId, batchDate, info.annotationId, info.version);
+            if (unit != null) info.unitId = unit.getId();
+            updateAnnotations.addToBatch(info.version+1, info.unitId, batchDate, info.annotationId, info.version);
           }
           else
@@ -674 +675 @@
 
           // Insert into ParameterValues
-          int valueId = insertIntoParameterValues.insert(discriminators[info.valueType.ordinal()]);
+          info.valueId = insertIntoParameterValues.insert(discriminators[info.valueType.ordinal()]);
           
           // Insert into **Values
           for (Object v : convertedValues)
           {
-            insertValues[info.valueType.ordinal()].addToBatch(valueId, v);
+            insertValues[info.valueType.ordinal()].addToBatch(info.valueId, v);
           }
 
@@ -692 +693 @@
 
           // Insert into Annotations
-          int annotationId = insertIntoAnnotations.insert(currentAnnotationSetId, info.annotationTypeId, null, valueId, batchDate);
+          info.annotationId = insertIntoAnnotations.insert(currentAnnotationSetId, info.annotationTypeId, null, info.valueId, batchDate);
         }
       }
@@ -704 +705 @@
     // the SnapshotManager to clear the cache when this
     // batcher is closed
-    if (changeType != Change.NO_CHANGE && deleteSnapshotIfModifed) 
-    {
-      deleteSnapshotIfModifed = false;
-      snapshotsToDelete.add(currentAnnotationSetId);
+    if (changeType != Change.NO_CHANGE) 
+    {
+      if (deleteSnapshotIfModifed)
+      {
+        deleteSnapshotIfModifed = false;
+        snapshotsToDelete.add(currentAnnotationSetId);
+      }
     }
     
@@ -739 +743 @@
     */
     DELETED;
+    
   }
   
@@ -778 +783 @@
   }
   
-  
   /**
     Batcher implementation for inserting into tables.