SSDM-4187: CLI data set uploader works. Bug found and fixed: Authorization...

SSDM-4187: CLI data set uploader works. Bug found and fixed: Authorization failed for project samples in context with non-admin users.

SVN: 37845

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java

@@ -35,12 +35,12 @@ public class DefaultDropbox extends AbstractJavaDataSetRegistrationDropboxV2
     public void process(IDataSetRegistrationTransactionV2 transaction)
     {
         IDataSet dataSet = transaction.createNewDataSet();
-        if (dataSet.getExperiment() == null)
+        if (dataSet.getExperiment() == null && dataSet.getSample() == null)
         {
             ISampleImmutable sample = transaction.getSearchService().getSample(SAMPLE_IDENTIFIER);
             if (sample == null)
             {
-                transaction.createNewSample(SAMPLE_IDENTIFIER, "UNKNOWN");
+                sample = transaction.createNewSample(SAMPLE_IDENTIFIER, "UNKNOWN");
             }
             dataSet.setSample(sample);
         }

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifier.java

@@ -120,13 +120,12 @@ public class SampleOwnerIdentifier extends AbstractHashable implements Serializa
     }
 
     /**
-     * It is a good pattern to use {@link #isSpaceLevel()} before calling this method.
-     * 
-     * @return The space which is the owner or null if the owner is not a space, but database instance.
+     * Returns the space identifier. In case of project samples the project identifier is returned.
+     * In case of shared sample <code>null</code> is returned.
      */
     public SpaceIdentifier getSpaceLevel()
     {
-        return spaceIdentOrNull;
+        return projectIdentifier != null ? projectIdentifier : spaceIdentOrNull;
     }
 
     //