#7176 add testing for null host DV on DS Create

IQSS · Aug 11, 2020 · 263a013 · 263a013
1 parent 3029502
commit 263a013
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1270,6 +1270,9 @@ public boolean canUpdateDataset() {
         return permissionsWrapper.canUpdateDataset(dvRequestService.getDataverseRequest(), this.dataset);
     }
     public boolean canPublishDataverse() {
+        if (dataset.getOwner() == null){
+            return false;
+        }
         return permissionsWrapper.canIssuePublishDataverseCommand(dataset.getOwner());
     }
 
@@ -1623,6 +1626,9 @@ private void updateDatasetFieldInputLevels() {
      *
      */    
      private void updateDatasetFieldInputLevels() {
+         if(dataset.getOwner() == null){
+             return;
+         }
          Long dvIdForInputLevel = ownerId;
 
          // OPTIMIZATION (?): replaced "dataverseService.find(ownerId)" with 
@@ -1864,7 +1870,9 @@ private String init(boolean initFull) {
                 //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionByVersionId(versionId);
 
             }
-            this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSizeForStore(dataset.getOwner().getEffectiveStorageDriverId());
+            if (dataset.getOwner() != null) {
+                this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSizeForStore(dataset.getOwner().getEffectiveStorageDriverId());
+            }
 
 
             if (retrieveDatasetVersionResponse == null) {
@@ -3948,12 +3956,15 @@ public boolean releaseDraftPopup(){
 
     public boolean publishDatasetPopup(){
         if (!dataset.isReleased()) {
-            return dataset.getOwner().isReleased();
+            return dataset.getOwner() != null && dataset.getOwner().isReleased();
         }
        return false; 
     }
 
     public boolean publishBothPopup() {
+        if (dataset.getOwner() == null){
+            return false;
+        }
         if (!dataset.getOwner().isReleased()) {
             if (canPublishDataverse()) {
                 if (dataset.getOwner().getOwner() == null

diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
@@ -3082,7 +3082,8 @@ public boolean rsyncUploadSupported() {
     	// ToDo - rsync was written before multiple store support and currently is hardcoded to use the "s3" store. 
     	// When those restrictions are lifted/rsync can be configured per store, this test should check that setting
     	// instead of testing for the 's3" store.
-    	return settingsWrapper.isRsyncUpload() && dataset.getDataverseContext().getEffectiveStorageDriverId().equals("s3");
+    	return settingsWrapper.isRsyncUpload() && dataset.getDataverseContext() != null &&
+                dataset.getDataverseContext().getEffectiveStorageDriverId().equals("s3");
     }