diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-11-01 17:44:53 +0200 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-11-01 17:44:53 +0200 |
| commit | 73e0e41cc59eae7e98cbd3386fd2df7be4d66d49 (patch) | |
| tree | 3c716e85a0fb20c69d75120dff4e48448dbc83e4 /src/net/java/sip/communicator/impl/contactlist | |
| parent | 81e01969d7021f4264e2f4418c283d7533bbf22b (diff) | |
| download | jitsi-73e0e41cc59eae7e98cbd3386fd2df7be4d66d49.zip jitsi-73e0e41cc59eae7e98cbd3386fd2df7be4d66d49.tar.gz jitsi-73e0e41cc59eae7e98cbd3386fd2df7be4d66d49.tar.bz2 | |
Fixes NullPointerException when merging contacts.
Diffstat (limited to 'src/net/java/sip/communicator/impl/contactlist')
| -rw-r--r-- | src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java | 3 |
1 files changed, 2 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 ac34766..bbf7545 100644 --- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java +++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java @@ -1022,7 +1022,8 @@ public class MetaContactListServiceImpl OperationSetMultiUserChat opSetMUC = provider.getOperationSet(OperationSetMultiUserChat.class); - if(opSetMUC.isPrivateMessagingContact(contact.getAddress())) + if(opSetMUC != null + && opSetMUC.isPrivateMessagingContact(contact.getAddress())) { addNewContactToMetaContact(provider, newParentMetaContact, contact.getPersistableAddress()); |