From 20db1b0bd978158972f6fbc4374520b5735929ea Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 20 Nov 2013 18:46:23 +0200
Subject: [PATCH] Fixes left empty metacontact if move of contact fails.

---
 .../contactlist/MetaContactListServiceImpl.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
index bd8322b8e..bdcddad87 100644
--- 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;
+        }
     }
 
     /**