ZCS-11938 NPE for tag/contact/appointment delete action

Zimbra · Aug 16, 2022 · 5af84ce · 5af84ce
1 parent 3ccddad
commit 5af84ce
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/store/src/java/com/zimbra/cs/mailbox/Mailbox.java b/store/src/java/com/zimbra/cs/mailbox/Mailbox.java
@@ -9999,7 +9999,11 @@ protected void endTransaction(boolean success) throws ServiceException {
                 if (deletes.blobs != null) {
                     // delete any blobs associated with items deleted from db/index
                     for (MailboxBlob blob : deletes.blobs) {
-                        StoreManager sm = StoreManager.getReaderSMInstance(blob.getLocator());
+                        StoreManager sm = StoreManager.getInstance();
+                        // if blob is not null then pull respective SM instance
+                        if (blob != null) {
+                            sm = StoreManager.getReaderSMInstance(blob.getLocator());
+                        }
                         sm.quietDelete(blob);
                     }
                 }