Updating Live Assistant 2.0 Server to check for ChatBots

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@201 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/spi/IQRouterImpl.java

@@ -11,19 +11,19 @@
 
 package org.jivesoftware.messenger.spi;
 
-import org.jivesoftware.messenger.container.BasicModule;
-import org.jivesoftware.messenger.container.TrackInfo;
-import org.jivesoftware.messenger.container.ServiceLookupFactory;
-import org.jivesoftware.util.LocaleUtils;
-import org.jivesoftware.util.Log;
-import org.jivesoftware.messenger.*;
-import org.jivesoftware.messenger.chatbot.ChatbotManager;
-import org.jivesoftware.messenger.handler.IQHandler;
-import org.jivesoftware.messenger.auth.UnauthorizedException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import javax.xml.stream.XMLStreamException;
+import org.jivesoftware.messenger.*;
+import org.jivesoftware.messenger.auth.UnauthorizedException;
+import org.jivesoftware.messenger.chatbot.ChatbotManager;
+import org.jivesoftware.messenger.container.BasicModule;
+import org.jivesoftware.messenger.container.ServiceLookupFactory;
+import org.jivesoftware.messenger.container.TrackInfo;
+import org.jivesoftware.messenger.handler.IQHandler;
+import org.jivesoftware.util.LocaleUtils;
+import org.jivesoftware.util.Log;
 
 /**
  * Generic presence routing base class.
@@ -44,12 +44,6 @@ public class IQRouterImpl extends BasicModule implements IQRouter {
      */
     public IQRouterImpl() {
         super("XMPP IQ Router");
-        try {
-            chatBotManager = (ChatbotManager)ServiceLookupFactory.getLookup().lookup(ChatbotManager.class);
-        }
-        catch (UnauthorizedException e) {
-            Log.error(e);
-        }
     }
 
     public void route(IQ packet) {
@@ -77,17 +71,26 @@ public class IQRouterImpl extends BasicModule implements IQRouter {
         }
     }
 
-     private boolean isLocalServer(XMPPAddress recipientJID) {
+    private boolean isLocalServer(XMPPAddress recipientJID) {
         boolean isLocalServer = recipientJID == null || recipientJID.getHost() == null
                 || "".equals(recipientJID.getHost()) || recipientJID.getResource() == null
                 || "".equals(recipientJID.getResource());
 
 
-             if(recipientJID != null){
-               isLocalServer = !chatBotManager.isChatbot(recipientJID);
-             }
-         return isLocalServer;
-     }
+
+        if (recipientJID != null && isLocalServer) {
+            if (chatBotManager == null) {
+                try {
+                    chatBotManager = (ChatbotManager)ServiceLookupFactory.getLookup().lookup(ChatbotManager.class);
+                }
+                catch (UnauthorizedException e) {
+                    Log.error(e);
+                }
+            }
+            isLocalServer = !chatBotManager.isChatbot(recipientJID);
+        }
+        return isLocalServer;
+    }
 
     private void handle(IQ packet) {