Throw an exception when installing a duplicate account.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderFactoryIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderFactoryIcqImpl.java
index 7971d57..9e04aeb 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderFactoryIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/ProtocolProviderFactoryIcqImpl.java
@@ -98,6 +98,11 @@ public class ProtocolProviderFactoryIcqImpl
 
         AccountID accountID = new IcqAccountID(userIDStr, accountProperties);
 
+        //make sure we haven't seen this account id before.
+        if( registeredAccounts.containsKey(accountID) )
+            throw new IllegalStateException(
+                "An account for id " + userIDStr + " was already installed!");
+
         //first store the account and only then load it as the load generates
         //an osgi event, the osgi event triggers (trhgough the UI) a call to
         //the register() method and it needs to acces the configuration service
@@ -132,11 +137,6 @@ public class ProtocolProviderFactoryIcqImpl
 
         AccountID accountID = new IcqAccountID(userIDStr, accountProperties);
 
-        //make sure we haven't seen this account id before.
-        if( registeredAccounts.containsKey(accountID) )
-            throw new IllegalStateException(
-                "An account for id " + userIDStr + " was already installed!");
-
         //get a reference to the configuration service and register whatever
         //properties we have in it.