NOJIRA - added some additional error checking to not fail on an otherwise odd 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 113729df2d5324c9d16ae3c07e8b393d2094e709..44bb51bd170909213655ea4c54d2995b1267d9e3 100644 (file)
--- 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\r
                                DocumentBlobHolder docBlobHolder = (DocumentBlobHolder) documentModel\r
                                                .getAdapter(BlobHolder.class);\r
-                               boolean deleteSuccess = NuxeoUtils.deleteFileOfBlob(docBlobHolder.getBlob());\r
+                               Blob blob = docBlobHolder.getBlob();\r
+                               if(blob == null) {\r
+                                       logger.error("Could not get blob for original image. Trying to delete original for: {}",\r
+                                                       file.getName());\r
+                               } else {\r
+                                       boolean deleteSuccess = NuxeoUtils.deleteFileOfBlob(docBlobHolder.getBlob());\r
+                               }\r
                        }\r
                } catch (Exception e) {\r
                        result = null;\r