- No longer pass the same RoutingTable instance to each processor. Reference...

- No longer pass the same RoutingTable instance to each processor. Reference the instance that's kept in the parent class instead;
- renamed a field from the inner class that was hiding a field from the parent class.

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

src/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java

@@ -108,7 +108,7 @@ public class OutgoingSessionPromise implements RoutableChannelHandler {
                                 packetsProcessor = packetsProcessors.get(domain);
                                 if (packetsProcessor == null) {
                                     packetsProcessor =
-                                            new PacketsProcessor(OutgoingSessionPromise.this, domain, routingTable);
+                                            new PacketsProcessor(OutgoingSessionPromise.this, domain);
                                     packetsProcessors.put(domain, packetsProcessor);
                                     newProcessor = true;
                                 }
@@ -177,18 +177,16 @@ public class OutgoingSessionPromise implements RoutableChannelHandler {
 
         private OutgoingSessionPromise promise;
         private String domain;
-        private RoutingTable routingTable;
-        private Queue<Packet> packets = new ConcurrentLinkedQueue<Packet>();
+        private Queue<Packet> packetQueue = new ConcurrentLinkedQueue<Packet>();
 
-        public PacketsProcessor(OutgoingSessionPromise promise, String domain, RoutingTable routingTable) {
+        public PacketsProcessor(OutgoingSessionPromise promise, String domain) {
             this.promise = promise;
             this.domain = domain;
-            this.routingTable = routingTable;
         }
 
         public void run() {
             while (!isDone()) {
-                Packet packet = packets.poll();
+                Packet packet = packetQueue.poll();
                 if (packet != null) {
                     try {
                         sendPacket(packet);
@@ -277,7 +275,7 @@ public class OutgoingSessionPromise implements RoutableChannelHandler {
         }
 
         public void addPacket(Packet packet) {
-            packets.add(packet);
+            packetQueue.add(packet);
         }
 
         public String getDomain() {
@@ -285,7 +283,7 @@ public class OutgoingSessionPromise implements RoutableChannelHandler {
         }
 
         public boolean isDone() {
-            return packets.isEmpty();
+            return packetQueue.isEmpty();
         }
     }
 }