bug fixes

3 files changed, 40 insertions, 22 deletions

diff --git a/java/src/IceInternal/Endpoint.java b/java/src/IceInternal/Endpoint.java
index 6346decfe2f..e4ee5bb6d45 100644
--- a/java/src/IceInternal/Endpoint.java
+++ b/java/src/IceInternal/Endpoint.java
@@ -43,18 +43,18 @@ public abstract class Endpoint
         String type = s.substring(0, m.start());
         if (type.equals("tcp"))
         {
-            return new TcpEndpoint(s.substring(m.end() + 1));
+            return new TcpEndpoint(s.substring(m.end()));
         }
 
         if (type.equals("ssl"))
         {
             // TODO: SSL
-            //return new SslEndpoint(s.substring(m.end() + 1));
+            //return new SslEndpoint(s.substring(m.end()));
         }
 
         if (type.equals("udp"))
         {
-            return new UdpEndpoint(s.substring(m.end() + 1));
+            return new UdpEndpoint(s.substring(m.end()));
         }
 
         throw new Ice.EndpointParseException();
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 1a7b8681a79..dd347107b35 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -42,6 +42,7 @@ public final class Reference
         mode = ModeTwoway;
         secure = false;
         hashValue = 0;
+        facet = "";
 
         String s = str.trim();
         if (s.length() == 0)
@@ -61,7 +62,7 @@ public final class Reference
         }
 
         String[] arr = init.split("[ \t\n\r]+");
-        String identity = arr[0];
+        identity = arr[0];
 
         int i = 1;
         while (i < arr.length)
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index dc0b1a752b2..b9ce234b600 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -291,6 +291,7 @@ public final class ThreadPool
                     _instance.objectAdapterFactory().shutdown();
                 }
 
+                _selector.selectedKeys().clear();
                 int ret = 0;
                 try
                 {
@@ -307,7 +308,7 @@ public final class ThreadPool
                     throw se;
                 }
 
-                if (ret == 0) // Timeout.
+                if (ret == 0 && !_interrupted) // Timeout.
                 {
                     assert(_timeout > 0);
                     _timeout = 0;
@@ -323,6 +324,7 @@ public final class ThreadPool
                         // Don't clear the interrupt fd if destroyed, so that
                         // the other threads exit as well.
                         //
+                        _selector.wakeup();
                         return;
                     }
 
@@ -363,7 +365,7 @@ public final class ThreadPool
                         //
                         // Handlers are permanently removed.
                         //
-                        java.util.ListIterator p = _adds.listIterator();
+                        java.util.ListIterator p = _removes.listIterator();
                         while (p.hasNext())
                         {
                             java.nio.channels.SelectionKey key =
@@ -417,25 +419,40 @@ public final class ThreadPool
                     {
                         java.util.Set keys = _selector.selectedKeys();
                         java.util.Iterator i = keys.iterator();
-                        assert(i.hasNext());
-                        java.nio.channels.SelectionKey key =
-                            (java.nio.channels.SelectionKey)i.next();
-                        HandlerInfo info = (HandlerInfo)key.attachment();
-                        i.remove();
-                        assert(info != null);
-
-                        //
-                        // Make the fd for the handler the most recently used
-                        // one by moving it to the beginning of the the reap
-                        // list.
-                        //
-                        if (info != _reapList)
+                        while (i.hasNext())
                         {
-                            removeHandler(info);
-                            addHandler(info);
+                            java.nio.channels.SelectionKey key =
+                                (java.nio.channels.SelectionKey)i.next();
+                            //
+                            // Ignore selection keys that have been
+                            // cancelled
+                            //
+                            if (key.isValid())
+                            {
+                                HandlerInfo info =
+                                    (HandlerInfo)key.attachment();
+                                assert(info != null);
+
+                                //
+                                // Make the fd for the handler the most
+                                // recently used one by moving it to the
+                                // beginning of the the reap list.
+                                //
+                                if (info != _reapList)
+                                {
+                                    removeHandler(info);
+                                    addHandler(info);
+                                }
+
+                                handler = info.handler;
+                                break;
+                            }
                         }
 
-                        handler = info.handler;
+                        if (handler == null)
+                        {
+                            continue repeatSelect;
+                        }
                     }
                 }