Changeset 6969

Timestamp:

Oct 2, 2015, 11:40:02 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #1941: Store experimental factor values as part experiments

Fixes a NullPointerException in array design validator when the item overview was rooted on an array design (parentNode==null).

File:

• trunk/src/core/net/sf/basedb/util/overview/validator/ArrayDesignValidator.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/overview/validator/ArrayDesignValidator.java

@@ -86 +86 @@
     // Check that a raw bioassay has same "direct" array desing as
     // via physical bioassay->slide...
-    Item parentType = parentNode.getItemType();
-    if (parentNode != null && (parentType == Item.RAWBIOASSAY || parentType == Item.ROOTRAWBIOASSAY))
+    Item parentType = parentNode != null ? parentNode.getItemType() : null;
+    if (parentType == Item.RAWBIOASSAY || parentType == Item.ROOTRAWBIOASSAY)
     {
       RawBioAssay rba = parentType == Item.RAWBIOASSAY ? (RawBioAssay)parentNode.getItem(dc) : ((RootRawBioAssay)parentNode.getItem()).getRawBioAssay();