diff options
| author | Michi Henning <michi@zeroc.com> | 2009-01-28 06:55:36 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2009-01-28 06:55:36 +1000 |
| commit | 09b4a1830989b33d06e7a421dbf197d2aa335b91 (patch) | |
| tree | 61a84913028a1d08a3dfa83f5b519ccda3fd1e9b /java/src/IceInternal/ThreadPool.java | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=3483 - Move Freeze to separate Jar file (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-09b4a1830989b33d06e7a421dbf197d2aa335b91.tar.bz2 ice-09b4a1830989b33d06e7a421dbf197d2aa335b91.tar.xz ice-09b4a1830989b33d06e7a421dbf197d2aa335b91.zip | |
Merge branch 'R3_3_branch'
Diffstat (limited to 'java/src/IceInternal/ThreadPool.java')
| -rw-r--r-- | java/src/IceInternal/ThreadPool.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java index 78316f1f910..ea80b046a77 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/IceInternal/ThreadPool.java @@ -524,6 +524,8 @@ public final class ThreadPool } catch(Ice.DatagramLimitException ex) // Expected. { + handler._stream.pos(0); + handler._stream.resize(0, true); continue; } catch(Ice.SocketException ex) @@ -548,6 +550,8 @@ public final class ThreadPool _instance.initializationData().logger.warning( "datagram connection exception:\n" + ex + "\n" + handler.toString()); } + handler._stream.pos(0); + handler._stream.resize(0, true); } else { @@ -718,6 +722,16 @@ public final class ThreadPool { BasicStream stream = handler._stream; + if(stream.pos() >= Protocol.headerSize) + { + if(!handler.read(stream)) + { + return false; + } + assert(stream.pos() == stream.size()); + return true; + } + if(stream.size() == 0) { stream.resize(Protocol.headerSize, true); @@ -805,8 +819,6 @@ public final class ThreadPool _instance.initializationData().logger.warning("DatagramLimitException: maximum size of " + stream.pos() + " exceeded"); } - stream.pos(0); - stream.resize(0, true); throw new Ice.DatagramLimitException(); } else |