Changeset 6532

Timestamp:

Sep 22, 2014, 8:24:33 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1845: Changing the conversion formula for a unit doesn't invalidate the snapshot cache

File:

• branches/3.3-stable/src/core/net/sf/basedb/core/Unit.java (modified) (2 diffs)

branches/3.3-stable/src/core/net/sf/basedb/core/Unit.java

@@ -24 +24 @@
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
 import net.sf.basedb.core.Transactional.Action;
+import net.sf.basedb.core.data.AnnotationSetData;
 import net.sf.basedb.core.data.QuantityData;
 import net.sf.basedb.core.data.UnitData;
 import net.sf.basedb.core.data.UnitSymbolData;
+import net.sf.basedb.core.snapshot.SnapshotManager;
 import net.sf.basedb.util.formatter.Formatter;
 import net.sf.basedb.util.formatter.PrefixSuffixFormatter;
@@ -550 +553 @@
           HibernateUtil.executeUpdate(query);
         }
+        
+        // We also need to invalidate the annotations in the snapshot cache
+        org.hibernate.Query query = HibernateUtil.createQuery(getDbControl().getHibernateSession(), 
+          "SELECT a.annotationSet " +
+          "FROM AnnotationData a " +
+          "INNER JOIN a.annotationType at " + 
+          "WHERE (a.unit = :unit OR at.defaultUnit = :unit) AND a.unit <> at.defaultUnit");
+        query.setEntity("unit", getData());
+        List<AnnotationSetData> tmp = HibernateUtil.loadList(AnnotationSetData.class, query, getSessionControl());
+        for (AnnotationSetData as : tmp)
+        {
+          SnapshotManager.removeSnapshot(as.getId());
+        }
       }
     }