bugfix: NPE when retrieving properties over JSON

SVN: 27080

openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java

@@ -327,6 +327,8 @@ public final class DataSet implements Serializable, IIdHolder
         InitializingChecks.checkValidString(initializer.getCode(), "Unspecified code.");
         this.code = initializer.getCode();
 
+        this.retrievedConnections = initializer.getRetrievedConnections();
+
         if (initializer.isStub)
         {
             this.isStub = true;
@@ -342,7 +344,6 @@ public final class DataSet implements Serializable, IIdHolder
 
             this.properties = initializer.getProperties();
 
-            this.retrievedConnections = initializer.getRetrievedConnections();
             this.parentCodes = initializer.getParentCodes();
             this.childrenCodes = initializer.getChildrenCodes();
 

openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java

@@ -193,8 +193,9 @@ public final class Experiment implements Serializable, IIdentifierHolder, IIdHol
                     "Unspecified entity registration details.");
             this.registrationDetails = initializer.getRegistrationDetails();
 
-            this.properties = initializer.getProperties();
         }
+
+        this.properties = initializer.getProperties();
     }
 
     /**

openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java

@@ -312,6 +312,8 @@ public final class Sample implements Serializable, IIdentifierHolder, IIdHolder
         InitializingChecks.checkValidString(initializer.getPermId(), "Unspecified permanent id.");
         this.permId = initializer.getPermId();
 
+        this.retrievedFetchOptions = initializer.getRetrievedFetchOptions();
+
         if (initializer.isStub)
         {
             this.isStub = true;
@@ -340,7 +342,6 @@ public final class Sample implements Serializable, IIdentifierHolder, IIdHolder
                     "Unspecified entity registration details.");
             this.registrationDetails = initializer.getRegistrationDetails();
 
-            this.retrievedFetchOptions = initializer.getRetrievedFetchOptions();
             if (initializer.parentReferences != null)
             {
                 this.parentReferences = initializer.parentReferences;