Fixes left empty metacontact if move of contact fails.

13 years ago · 20db1b0bd9
parent 2c6901b582
commit 20db1b0bd9
1 changed files with 13 additions and 1 deletions
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
@ -991,7 +991,19 @@ public void moveContact(Contact contact,
                             , MetaContactEvent.META_CONTACT_ADDED);

        /** then move the sub contactact to the new metacontact container */
-        moveContact(contact, metaContactImpl);
+        try
+        {
+            moveContact(contact, metaContactImpl);
+        }
+        catch(MetaContactListException mex)
+        {
+            newParentMetaGroupImpl.removeMetaContact(metaContactImpl);
+            fireMetaContactEvent(metaContactImpl
+                , newParentMetaGroupImpl
+                , MetaContactEvent.META_CONTACT_REMOVED);
+
+            throw mex;
+        }
    }

    /**