From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 17 Jan 2013 21:03:03 +0000 (-0800)
Subject: NOJIRA - added some additional error checking to not fail on an otherwise odd error... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a76bd8c9ac6a8b44a1235821f7c6ad2c3db6d6f4;p=tmp%2Fjakarta-migration.git

NOJIRA - added some additional error checking to not fail on an otherwise odd error (inability to delete an original image when creating a blob from a remote URL). Logged as an error.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
index 113729df2..44bb51bd1 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
@@ -857,7 +857,13 @@ public class NuxeoImageUtils {
 				// Next, we need to remove the actual file from Nuxeo's data directory
 				DocumentBlobHolder docBlobHolder = (DocumentBlobHolder) documentModel
 						.getAdapter(BlobHolder.class);
-				boolean deleteSuccess = NuxeoUtils.deleteFileOfBlob(docBlobHolder.getBlob());
+				Blob blob = docBlobHolder.getBlob();
+				if(blob == null) {
+					logger.error("Could not get blob for original image. Trying to delete original for: {}",
+							file.getName());
+				} else {
+					boolean deleteSuccess = NuxeoUtils.deleteFileOfBlob(docBlobHolder.getBlob());
+				}
 			}
 		} catch (Exception e) {
 			result = null;