Commits a part of the fix.patch provided by Dmitri Melnikov in the dev maling list thread "password storage exception" in order to try to address NullPointerExceptions.

2 files changed, 30 insertions, 27 deletions

diff --git a/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java b/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java
index 217f4b3..a199eab 100644
--- a/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java
@@ -311,11 +311,16 @@ public class CredentialsStorageServiceImpl
             if (idx != -1)
             {
                 String prefix = prop.substring(0, idx);
-                String password
-                    = new String(Base64.decode(getUnencrypted(prefix)));
-                
-                if (!movePasswordProperty(prefix, password))
+                String encodedPassword = getUnencrypted(prefix);
+
+                if ((encodedPassword == null) || (encodedPassword.length() == 0))
+                    setUnencrypted(prefix, null);
+                else if (!movePasswordProperty(
+                        prefix,
+                        new String(Base64.decode(encodedPassword))))
+                {
                     logger.warn("Failed to move password for prefix " + prefix);
+                }
             }
         }
     }
diff --git a/src/net/java/sip/communicator/impl/protocol/AccountManagerImpl.java b/src/net/java/sip/communicator/impl/protocol/AccountManagerImpl.java
index c13157b..ec550d1 100644
--- a/src/net/java/sip/communicator/impl/protocol/AccountManagerImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/AccountManagerImpl.java
@@ -137,12 +137,15 @@ public class AccountManagerImpl
                 configService.getPropertyNamesByPrefix(storedAccount, true);

             Map<String, String> accountProperties =

                 new Hashtable<String, String>();

-

-            boolean isDisabled = false;

-

-            for (Iterator<String> storedAccountPropertyIter =

-                storedAccountProperties.iterator(); storedAccountPropertyIter

-                .hasNext();)

+            boolean disabled = false;

+            CredentialsStorageService credentialsStorage

+                = ServiceUtils.getService(

+                        bundleContext,

+                        CredentialsStorageService.class);

+

+            for (Iterator<String> storedAccountPropertyIter

+                        = storedAccountProperties.iterator();

+                    storedAccountPropertyIter.hasNext();)

             {

                 String property = storedAccountPropertyIter.next();

                 String value = configService.getString(property);

@@ -150,17 +153,12 @@ public class AccountManagerImpl
                 property = stripPackagePrefix(property);

 

                 if (ProtocolProviderFactory.IS_ACCOUNT_DISABLED.equals(property))

-                {

-                    isDisabled = new Boolean(value).booleanValue();

-                }

+                    disabled = Boolean.parseBoolean(value);

                 // Decode passwords.

-                else if (ProtocolProviderFactory.PASSWORD.equals(property))

+                else if (ProtocolProviderFactory.PASSWORD.equals(property)

+                        && !credentialsStorage.isStoredEncrypted(storedAccount))

                 {

-                    if (value == null)

-                    {

-                        value = "";

-                    }

-                    else if (value.length() != 0)

+                    if ((value != null) && value.length() != 0)

                     {

 

                         /*

@@ -172,9 +170,7 @@ public class AccountManagerImpl
                 }

 

                 if (value != null)

-                {

                     accountProperties.put(property, value);

-                }

             }

 

             try

@@ -190,10 +186,8 @@ public class AccountManagerImpl
                 {

                     storedAccounts.add(accountID);

                 }

-                if (!isDisabled)

-                {

+                if (!disabled)

                     factory.loadAccount(accountID);

-                }

             }

             catch (Exception ex)

             {

@@ -599,11 +593,15 @@ public class AccountManagerImpl
                     = ServiceUtils.getService(

                             bundleContext,

                             CredentialsStorageService.class);

+                String accountPrefix = factoryPackage + "." + accountNodeName;

 

                 // encrypt and store

-                if (!credentialsStorage.storePassword(

-                        factoryPackage + "." + accountNodeName,

-                        value))

+                if ((value != null)

+                        && (value.length() != 0)

+                        && !credentialsStorage.isStoredEncrypted(accountPrefix)

+                        && !credentialsStorage.storePassword(

+                                accountPrefix,

+                                value))

                 {

                     throw

                         new OperationFailedException(