Merge pull request #7838 from laboro/fix/BAP-11039_1.9

BAP-11039: Integrity constraint violation during IMAP synchronization
oroinc · Jul 12, 2016 · 71faea5 · 71faea5
2 parents f3f8b9f + ec62d3f
commit 71faea5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php
@@ -577,7 +577,10 @@ protected function removeImapEmailReference(ImapEmail $imapEmail)
 
         $emailUser = $imapEmail->getEmail()->getEmailUserByFolder($imapEmail->getImapFolder()->getFolder());
         if ($emailUser != null) {
-            $imapEmail->getEmail()->getEmailUsers()->removeElement($emailUser);
+            $emailUser->removeFolder($imapEmail->getImapFolder()->getFolder());
+            if (!$emailUser->getFolders()->count()) {
+                $imapEmail->getEmail()->getEmailUsers()->removeElement($emailUser);
+            }
         }
         $this->em->remove($imapEmail);
     }