aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
authorEmil Ivov <emcho@jitsi.org>2006-11-02 12:51:39 +0000
committerEmil Ivov <emcho@jitsi.org>2006-11-02 12:51:39 +0000
commit0153458bca1e1edca90764ac162f135258b8ff15 (patch)
tree1f97adaf3cfbf5bd6d9391434c47ea21c43254a7 /src/net
parent101484662ff288367f8b55adcc3065a667ba4041 (diff)
downloadjitsi-0153458bca1e1edca90764ac162f135258b8ff15.zip
jitsi-0153458bca1e1edca90764ac162f135258b8ff15.tar.gz
jitsi-0153458bca1e1edca90764ac162f135258b8ff15.tar.bz2
Null pointer fix
Diffstat (limited to 'src/net')
-rw-r--r--src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
index 5cd803a..deb221f 100644
--- a/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
+++ b/src/net/java/sip/communicator/service/protocol/ProtocolProviderFactory.java
@@ -370,9 +370,18 @@ public abstract class ProtocolProviderFactory
//if this is a password - decode it first
if(propertyName.equals(PASSWORD))
- storedPropertyValue = new String(
- Base64.decode(storedPropertyValue));
-
+ {
+ if(storedPropertyValue == null
+ || storedPropertyValue.length() == 0)
+ {
+ storedPropertyValue = "";
+ }
+ else
+ {
+ storedPropertyValue = new String(
+ Base64.decode(storedPropertyValue));
+ }
+ }
accountProperties.put(propertyName, storedPropertyValue);
}
loadAccount(accountProperties);