aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/service
diff options
context:
space:
mode:
authorDanny van Heumen <danny@dannyvanheumen.nl>2014-11-02 17:41:16 +0100
committerDanny van Heumen <danny@dannyvanheumen.nl>2014-11-02 18:10:03 +0100
commit42cd6f74ba3ed45acd9c8ea07d21fc9e854c66e7 (patch)
treefa16bd7c9faf7576f7f319145baa3796fec43abe /src/net/java/sip/communicator/service
parentb696de057f4a80de65400f6a0c2279d23798f778 (diff)
downloadjitsi-42cd6f74ba3ed45acd9c8ea07d21fc9e854c66e7.zip
jitsi-42cd6f74ba3ed45acd9c8ea07d21fc9e854c66e7.tar.gz
jitsi-42cd6f74ba3ed45acd9c8ea07d21fc9e854c66e7.tar.bz2
Fix NPE: Don't continue if chat room wrapper is null. (+ updated
documentation)
Diffstat (limited to 'src/net/java/sip/communicator/service')
-rw-r--r--src/net/java/sip/communicator/service/muc/MUCService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/service/muc/MUCService.java b/src/net/java/sip/communicator/service/muc/MUCService.java
index 1fb75bf..7a3337d 100644
--- a/src/net/java/sip/communicator/service/muc/MUCService.java
+++ b/src/net/java/sip/communicator/service/muc/MUCService.java
@@ -169,7 +169,8 @@ public abstract class MUCService
* @param join whether we should join the room after creating it.
* @param persistent whether the newly created room will be persistent.
* @param isPrivate whether the room will be private or public.
- * @return the <tt>ChatRoomWrapper</tt> corresponding to the created room
+ * @return the <tt>ChatRoomWrapper</tt> corresponding to the created room or
+ * <tt>null</tt> if the protocol failed to create the chat room
*/
public abstract ChatRoomWrapper createChatRoom(String roomName,
ProtocolProviderService protocolProvider, Collection<String> contacts,