aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2014-05-12 13:01:24 +0300
committerDamian Minkov <damencho@jitsi.org>2014-05-12 13:10:32 +0300
commitf53deae419296cd31a795bfea02cde6f7dde1237 (patch)
treeb5d5db8ad3ba06dd22f985938fc69b35f13840e1 /src/net/java/sip/communicator/impl
parentc5152acbe0f33178c8859517832de80c49d9d99c (diff)
downloadjitsi-f53deae419296cd31a795bfea02cde6f7dde1237.zip
jitsi-f53deae419296cd31a795bfea02cde6f7dde1237.tar.gz
jitsi-f53deae419296cd31a795bfea02cde6f7dde1237.tar.bz2
Fixes NPE, do nothing and close chat invite dialog if nothing selected.
Diffstat (limited to 'src/net/java/sip/communicator/impl')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
index b8cac1a..331d9f5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
@@ -127,8 +127,11 @@ public class ChatInviteDialog
Collection<String> selectedContactAddresses = new ArrayList<String>();
// Obtain selected contacts.
- Iterator<UIContact> selectedContacts
- = destContactList.getContacts(null).iterator();
+ Collection<UIContact> contacts = destContactList.getContacts(null);
+ if(contacts == null)
+ return;
+
+ Iterator<UIContact> selectedContacts = contacts.iterator();
if (selectedContacts != null)
{