rearranged the order of operations inside FinalizeDatasetPublicationC…

…ommand. #6558
IQSS · Apr 13, 2020 · 093ed6d · 093ed6d
1 parent 840f389
commit 093ed6d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/.../java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java b/.../java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java
@@ -71,6 +71,17 @@ public FinalizeDatasetPublicationCommand(Dataset aDataset, DataverseRequest aReq
     public Dataset execute(CommandContext ctxt) throws CommandException {
         Dataset theDataset = getDataset();
 
+        // validate the physical files before we do anything else: 
+        // (unless specifically disabled)
+        if (theDataset.getLatestVersion().getVersionState() != RELEASED
+                && ctxt.systemConfig().isDatafileValidationOnPublishEnabled()) {
+            // some imported datasets may already be released.
+
+            // validate the physical files (verify checksums):
+            validateDataFiles(theDataset, ctxt);
+            // (this will throw a CommandException if it fails)
+        }
+
         if ( theDataset.getGlobalIdCreateTime() == null ) {
             registerExternalIdentifier(theDataset, ctxt);
         }
@@ -134,19 +145,15 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             ctxt.engine().submit(new DeletePrivateUrlCommand(getRequest(), theDataset));
         }
 
-	if ( theDataset.getLatestVersion().getVersionState() != RELEASED ) {
-		// some imported datasets may already be released.
-
-                // validate the physical files (verify checksums):
-                validateDataFiles(theDataset, ctxt);
-                // (this will throw a CommandException if it fails)
-
-		if (!datasetExternallyReleased){
-			publicizeExternalIdentifier(theDataset, ctxt);
-                        // (will also throw a CommandException, unless successful)
-		}
-		theDataset.getLatestVersion().setVersionState(RELEASED);
-	}
+	if (theDataset.getLatestVersion().getVersionState() != RELEASED) {
+            // some imported datasets may already be released.
+
+            if (!datasetExternallyReleased) {
+                publicizeExternalIdentifier(theDataset, ctxt);
+                // (will throw a CommandException, unless successful)
+            }
+            theDataset.getLatestVersion().setVersionState(RELEASED);
+        }
 
 
         // Remove locks

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -1688,10 +1688,11 @@ public static void validateDataFileChecksum(DataFile dataFile) throws IOExceptio
         }
 
         StorageIO<DataFile> storage = dataFile.getStorageIO();
-        storage.open(DataAccessOption.READ_ACCESS);
         InputStream in = null;
 
         try {
+            storage.open(DataAccessOption.READ_ACCESS);
+
             if (!dataFile.isTabularData()) {
                 in = storage.getInputStream();
             } else {