diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2011-09-15 12:51:20 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2011-09-15 12:51:20 +0000 |
| commit | f8e06f4b7c965b915408703e3b53c2c7cda82c42 (patch) | |
| tree | 9150b83313c3a73de9ef319e8a0d26944b50df83 /src/net/java/sip/communicator/impl/googlecontacts | |
| parent | 19546ed94af3145d3be7a03e4bdab299492c1a9a (diff) | |
| download | jitsi-f8e06f4b7c965b915408703e3b53c2c7cda82c42.zip jitsi-f8e06f4b7c965b915408703e3b53c2c7cda82c42.tar.gz jitsi-f8e06f4b7c965b915408703e3b53c2c7cda82c42.tar.bz2 | |
Fixes NullPointerException for previously stored google contacts accounts (reported by Emil Ivov).
Diffstat (limited to 'src/net/java/sip/communicator/impl/googlecontacts')
| -rw-r--r-- | src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java index c744ced..9c5a0aa 100644 --- a/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java +++ b/src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java @@ -114,8 +114,14 @@ public class GoogleContactsServiceImpl boolean enabled = Boolean.parseBoolean((String)oen); String login = (String)configService.getProperty(path + ".account"); + String prefix = (String)configService.getProperty(path + ".prefix"); + // If this property doesn't exist, like for old stored accounts, we + // just need to initialize it to the empty string. + if(prefix == null) + prefix = ""; + String password = credentialsService.loadPassword(path); GoogleContactsConnectionImpl cnx = (GoogleContactsConnectionImpl) |