more Win32 hack cleanup

7 files changed, 10 insertions, 101 deletions

diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index 33ec2527665..8d37fbfb35c 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -343,12 +343,6 @@ public final class Connection extends EventHandler
         return true;
     }
 
-    public boolean
-    tryRead(BasicStream stream)
-    {
-        return _transceiver.tryRead(stream);
-    }
-
     public void
     read(BasicStream stream)
     {
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index 3d0328a9271..ac68ea8ad98 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -18,13 +18,6 @@ abstract class EventHandler
     abstract boolean readable();
 
     //
-    // Try to read data (non-blocking) via the event handler. Returns
-    // true if a subsequent call to read() is necessary, false otherwise.
-    // May only be called if readable() returns true.
-    //
-    abstract boolean tryRead(BasicStream is);
-
-    //
     // Read data via the event handler. May only be called if
     // readable() returns true.
     //
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 83538c6f09a..cc35fe47cef 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -73,13 +73,6 @@ public class IncomingConnectionFactory extends EventHandler
         return false;
     }
 
-    public boolean
-    tryRead(BasicStream unused)
-    {
-        assert(false); // Must not be called.
-        return false;
-    }
-
     public void
     read(BasicStream unused)
     {
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index c9b98d1af4c..3b865c3a1bc 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -109,58 +109,6 @@ final class TcpTransceiver implements Transceiver
         }
     }
 
-    public boolean
-    tryRead(BasicStream stream)
-    {
-        java.nio.ByteBuffer buf = stream.prepareRead();
-
-        int remaining = 0;
-        if(_traceLevels.network >= 3)
-        {
-            remaining = buf.remaining();
-        }
-
-        while(true)
-        {
-            try
-            {
-                int ret = _fd.read(buf);
-
-                if(ret == -1)
-                {
-                    throw new Ice.ConnectionLostException();
-                }
-
-                if(ret > 0 && _traceLevels.network >= 3)
-                {
-                    String s = "received " + ret + " of " + remaining + " bytes via tcp\n" + toString();
-                    _logger.trace(_traceLevels.networkCat, s);
-                }
-
-                break;
-            }
-            catch(java.io.InterruptedIOException ex)
-            {
-                continue;
-            }
-            catch(java.io.IOException ex)
-            {
-                if(Network.connectionLost(ex))
-                {
-                    Ice.ConnectionLostException se = new Ice.ConnectionLostException();
-                    se.initCause(ex);
-                    throw se;
-                }
-
-                Ice.SocketException se = new Ice.SocketException();
-                se.initCause(ex);
-                throw se;
-            }
-        }
-
-        return buf.hasRemaining();
-    }
-
     public void
     read(BasicStream stream, int timeout)
     {
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index 40bd7427007..4472d02bfc1 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -418,27 +418,18 @@ public final class ThreadPool
                     }
                 }
 
-                //
-                // First, we call selectNonBlocking(). This is necessary to
-                // ensure that the selected key set is updated (i.e., new
-                // channels added, closed channels removed, etc.). If no keys
-                // are present in the key set, then we'll call select() to
-                // block until a new event is ready.
-                //
-                //selectNonBlocking();
-                //if(_keys.size() == 0)
+                select();
+                if(_keys.size() == 0) // Timeout.
                 {
-                    int ret = select();
-                    if(ret == 0) // Timeout.
+                    if(TRACE_SELECT)
                     {
-                        if(TRACE_SELECT)
-                        {
-                            trace("timeout");
-                        }
-
-                        _timeout = 0;
-                        shutdown = true;
+                        trace("timeout");
                     }
+
+                    assert(_timeout > 0);
+                    _timeout = 0;
+                    shutdown = true;
+                    continue repeatSelect;
                 }
 
                 EventHandler handler = null;
@@ -764,7 +755,7 @@ public final class ThreadPool
         }
     }
 
-    private int
+    private void
     select()
     {
         int ret = 0;
@@ -811,8 +802,6 @@ public final class ThreadPool
 
             break;
         }
-
-        return ret;
     }
 
     private void
diff --git a/java/src/IceInternal/Transceiver.java b/java/src/IceInternal/Transceiver.java
index 45c3928cda3..38d444ffa9f 100644
--- a/java/src/IceInternal/Transceiver.java
+++ b/java/src/IceInternal/Transceiver.java
@@ -16,7 +16,6 @@ public interface Transceiver
     void close();
     void shutdown();
     void write(BasicStream stream, int timeout);
-    boolean tryRead(BasicStream stream);
     void read(BasicStream stream, int timeout);
     String toString();
 }
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 919c8c0f3da..117abff35e3 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -81,13 +81,6 @@ final class UdpTransceiver implements Transceiver
         }
     }
 
-    public boolean
-    tryRead(BasicStream stream)
-    {
-        read(stream, 0);
-        return false; // Do not call read().
-    }
-
     public void
     read(BasicStream stream, int timeout)
     {