nullpointer fix

ErykKul · Jun 26, 2023 · 361e754 · 361e754
1 parent 0cad39a
commit 361e754
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -2846,10 +2846,15 @@ public String refresh() {
 
         if (persistentId != null) {
             setIdByPersistentId();
-        }
-        if (dataset.getId() != null) {
-            //retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionById(dataset.getId(), version);
-            dataset = datasetService.findDeep(dataset.getId());
+            if (this.getId() == null) {
+                logger.warning("No such dataset: "+persistentId);
+                return permissionsWrapper.notFound();
+            }
+            dataset = datasetService.findDeep(this.getId());
+            if (dataset == null) {
+                logger.warning("No such dataset: "+persistentId);
+                return permissionsWrapper.notFound();
+            }
             retrieveDatasetVersionResponse = datasetVersionService.selectRequestedVersion(dataset.getVersions(), version);
         } else if (versionId != null) {
             retrieveDatasetVersionResponse = datasetVersionService.retrieveDatasetVersionByVersionId(versionId);