OF-1239 Check for null MUCService.iqHandler table (#698)

1fb12d9a · Dave Cridland · daryl herzmann · 8e223368 · 1fb12d9a
Commit 1fb12d9a authored Dec 13, 2016 by Dave Cridland Committed by daryl herzmann Dec 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

MultiUserChatServiceImpl.java ...vesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java +3 -1

No files found.
--- a/src/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
+++ b/src/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
@@ -415,7 +415,7 @@ public class MultiUserChatServiceImpl implements Component, MultiUserChatService
        else if ("urn:xmpp:ping".equals(namespace)) {
            router.route( IQ.createResultIQ(iq) );
        }
-        else {
+        else if (this.iqHandlers != null) {
            IQHandler h = this.iqHandlers.get(namespace);
            if (h != null) {
                try {
@@ -432,6 +432,8 @@ public class MultiUserChatServiceImpl implements Component, MultiUserChatService
                return true;
            }
            return false;
+        } else {
+            return false;
        }
        return true;
    }