Changeset 7776

Timestamp:

Feb 18, 2020, 9:50:54 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2202: Include information from parent items in list pages

Fixes an issue with incorrect caching in the transition from Physical Bioassay to Extract. We need to keep the extract chain that was collected from Raw/Derived? bioassay until we reach a known extract.

If we don't do this the Pool aliquot and Pool will be cached without context and the next time we have a Library from the same Pool, we will get the Library item we will get the cached Library item instead of the Library in the context.

File:

• trunk/src/core/net/sf/basedb/util/AnnotationUtil.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/AnnotationUtil.java

@@ -222 +222 @@
     private Set<Integer> loadExtracts()
     {
-      Set<Integer> extractsInChain;
+      Set<Integer> extractsInChain = Collections.emptySet();
       switch (item.getType())
       {
@@ -229 +229 @@
         case RAWBIOASSAY:
         {
-          extractsInChain = new HashSet<Integer>();
+          extractsInChain = new HashSet<>();
           if (chain != null) extractsInChain.addAll(chain.extractsInChain);
           if (extract != null) extractsInChain.add(extract.getId());
           break;
         }
+        case EXTRACT:
+        {
+          if (chain != null && !chain.extractsInChain.contains(item.getId()))
+          {
+            extractsInChain = new HashSet<>(chain.extractsInChain);
+          }
+          break;
+        }
         default:
-        {
-          extractsInChain = Collections.emptySet();
-        }
+        {}
       }
       return extractsInChain;
@@ -356 +362 @@
       cmap.put(wrapper, parents);
     }
+
+    @Override
+    public String toString()
+    {
+      return cmap.toString();
+    }
+    
     
   }