Refactoring of NoSuchRouteException. JM-476

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

src/java/org/jivesoftware/messenger/net/SocketPacketWriteHandler.java

@@ -46,12 +46,13 @@ public class SocketPacketWriteHandler implements ChannelHandler {
             JID recipient = packet.getTo();
             // Check if the target domain belongs to a remote server or a component
             if (server.matchesComponent(recipient) || server.isRemote(recipient)) {
-                try {
                 // Locate the route to the remote server or component and ask it
                 // to process the packet
-                    routingTable.getRoute(recipient).process(packet);
+                ChannelHandler route = routingTable.getRoute(recipient);
+                if (route != null) {
+                    route.process(packet);
                 }
-                catch (NoSuchRouteException e) {
+                else {
                     // No root was found so either drop or store the packet
                     handleUnprocessedPacket(packet);
                 }

src/java/org/jivesoftware/messenger/net/SocketReader.java

@@ -556,20 +556,14 @@ public abstract class SocketReader implements Runnable {
             return false;
         }
         // Check if the host matches a subdomain of this host
-        RoutableChannelHandler route = null;
-        try {
-            route = routingTable.getRoute(new JID(host));
-            if (route instanceof OutgoingSessionPromise) {
+        RoutableChannelHandler route = routingTable.getRoute(new JID(host));
+        if (route == null || route instanceof OutgoingSessionPromise) {
             return true;
         }
         else {
             return false;
         }
     }
-        catch (NoSuchRouteException e) {
-            return true;
-        }
-    }
 
     /**
      * Tries to secure the connection using TLS. If the connection is secured then reset