Changeset 6968

Timestamp:

Oct 2, 2015, 11:36:10 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #1941: Store experimental factor values as part experiments

The annotation logger implementation did not handle inherited annotations correctly when logging of old property valus had been enabled (NullPointerException when trying to get the values).

File:

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

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

@@ -25 +25 @@
 import org.hibernate.Query;
 
+import net.sf.basedb.core.Annotation;
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.LogControl;
@@ -34 +35 @@
 import net.sf.basedb.core.data.ChangeHistoryDetailData;
 import net.sf.basedb.core.data.LoggableData;
+import net.sf.basedb.core.data.ParameterValueData;
 import net.sf.basedb.core.log.ChangeType;
 import net.sf.basedb.core.log.EntityDetails;
 import net.sf.basedb.core.log.EntityLogger;
 import net.sf.basedb.core.log.LogManager;
+import net.sf.basedb.core.plugin.ParameterValues;
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.formatter.Formatter;
@@ -139 +142 @@
     change.setItemId(parentId);
     change.setItemType(parentType);
-    change.setChangeInfo("Annotation["+annotationType+"]");
+    Annotation.Source source = Annotation.Source.values()[annotation.getSource()];
+    if (source == Annotation.Source.CLONED)
+    {
+      change.setChangeInfo("ClonedAnnotation["+annotationType+"]");
+    }
+    else if (source == Annotation.Source.INHERITED)
+    {
+      change.setChangeInfo("InheritedAnnotation["+annotationType+"]");
+    }
+    else
+    {
+      change.setChangeInfo("Annotation["+annotationType+"]");
+    }
     if (factory.isLoggingOldPropertyValues() && !disableLogOfValues)
     {
@@ -151 +166 @@
         f = EntityDetails.DATETIME_FORMAT;
       }
-      String newValues = Values.getString(annotation.getValues().getValues(), ", ", true, f);
-      String oldValues = Values.getString(annotation.getValues().getOldValues(), ", ", true, f);
-      change.setNewValue(newValues.length() == 0 ? null : newValues);
-      change.setOldValue(oldValues.length() == 0 ? null : oldValues);
+      ParameterValueData<?> values = annotation.getValues();
+      if (values != null)
+      {
+        String newValues = Values.getString(values.getValues(), ", ", true, f);
+        String oldValues = Values.getString(values.getOldValues(), ", ", true, f);
+        change.setNewValue(newValues.length() == 0 ? null : newValues);
+        change.setOldValue(oldValues.length() == 0 ? null : oldValues);
+      }
     }
     ((DbLogManager)logManager).logChangeDetails(change, details);