initial commit of C# transport changes

1 files changed, 10 insertions, 0 deletions

diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 15f1683cf4e..d8344adb130 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -66,6 +66,11 @@ final class UdpTransceiver implements Transceiver
             return SocketOperation.Write;
         }
 
+        if(!buf.b.hasRemaining())
+        {
+            return SocketOperation.None;
+        }
+
         assert(buf.b.position() == 0);
         assert(_fd != null && _state >= StateConnected);
 
@@ -127,6 +132,11 @@ final class UdpTransceiver implements Transceiver
     @SuppressWarnings("deprecation")
     public int read(Buffer buf, Ice.BooleanHolder moreData)
     {
+        if(!buf.b.hasRemaining())
+        {
+            return SocketOperation.None;
+        }
+
         assert(buf.b.position() == 0);
 
         final int packetSize = java.lang.Math.min(_maxPacketSize, _rcvSize - _udpOverhead);