Changeset 6857

Timestamp:

Apr 14, 2015, 1:49:15 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1908: Batch inheriting multiple annotations

Fixes a NPE when inheriting annotations to an item which has no annotations to begin with.

File:

• branches/3.5-stable/src/core/net/sf/basedb/core/snapshot/SnapshotManager.java (modified) (1 diff)

branches/3.5-stable/src/core/net/sf/basedb/core/snapshot/SnapshotManager.java

@@ -162 +162 @@
   {
     List<AnnotationSnapshot> result = new ArrayList<AnnotationSnapshot>();
-    if (!searchPrimary && !searchInherited) return result;
+    if (!searchPrimary && !searchInherited || snapshot == null) return result;
     
     if (filter == null) filter = new StaticFilter<AnnotationSnapshot>(true);