defensive coding to prevent lost exceptions on tempfile cleanup

fcrepo3 · Apr 2, 2015 · 632ba11 · 632ba11
1 parent 0ff095f
commit 632ba11
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fcrepo-server/src/main/java/org/fcrepo/server/validation/DOValidatorImpl.java b/fcrepo-server/src/main/java/org/fcrepo/server/validation/DOValidatorImpl.java
@@ -423,20 +423,20 @@ private File streamtoFile(InputStream objectAsStream)
 
             FileOutputStream fos = new FileOutputStream(objectAsFile);
             FileUtils.copy(objectAsStream, fos);
+            return objectAsFile;
         } catch (IOException e) {
             if (objectAsFile != null && objectAsFile.exists()) {
                 objectAsFile.delete();
             }
             throw e;
         }
-        return objectAsFile;
     }
 
     // Distinguish temporary object files from real object files
     // that were passed in for validation.  This is a bit ugly as it stands,
     // but it should only blow away files in the temp directory.
     private void cleanUp(File f) {
-        if (f.getParentFile() != null) {
+        if (f != null && f.getParentFile() != null) {
             if (m_absoluteTempPath.equalsIgnoreCase(f
                     .getParentFile().getAbsolutePath())) {
                 f.delete();