when we try to add a conact that's already in the list, throw the corresponding exception

2 files changed, 19 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
index dc82d64..80c7ade 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java
@@ -333,6 +333,17 @@ public class MetaContactListServiceImpl
             //wait for a confirmation event
             evtRetriever.waitForEvent(CONTACT_LIST_MODIFICATION_TIMEOUT);
         }
+        catch(OperationFailedException ex)
+        {
+            if(ex.getErrorCode()
+               == OperationFailedException.SUBSCRIPTION_ALREADY_EXISTS)
+            {
+                throw new MetaContactListException(
+                "failed to create contact" + contactID
+                , ex
+                , MetaContactListException.CODE_CONTACT_ALREADY_EXISTS_ERROR);
+            }
+        }
         catch (Exception ex)
         {
             throw new MetaContactListException(
diff --git a/src/net/java/sip/communicator/service/contactlist/MetaContactListException.java b/src/net/java/sip/communicator/service/contactlist/MetaContactListException.java
index aaf4bf9..fb0440e 100644
--- a/src/net/java/sip/communicator/service/contactlist/MetaContactListException.java
+++ b/src/net/java/sip/communicator/service/contactlist/MetaContactListException.java
@@ -30,10 +30,17 @@ public class MetaContactListException
     public static final int CODE_NETWORK_ERROR  = 2;
 
     /**
+     * Indicates that the exception was caused by the fact that we tried to
+     * add to our contact list a contact that was already in there.
+     */
+    public static final int CODE_CONTACT_ALREADY_EXISTS_ERROR  = 3;
+
+
+    /**
      * Indicates that the error which caused the exception was either unknown
      * or did not correspond to any of the other error codes
      */
-    public static final int CODE_UNKNOWN_ERROR  = 3;
+    public static final int CODE_UNKNOWN_ERROR  = 4;
 
     /**
      * An error code indicating the nature of this excepiton.