Fix handling of spurious wakeups in BufferManagerReadStream

orbmain/src/main/java/com/sun/corba/ee/impl/encoding/BufferManagerReadStream.java

@@ -12,6 +12,7 @@
 
 import java.nio.ByteBuffer;
 
+import com.sun.corba.ee.spi.orb.ORBData;
 import com.sun.corba.ee.spi.transport.ByteBufferPool;
 import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
@@ -21,6 +22,7 @@
 import com.sun.corba.ee.spi.trace.Transport;
 
 import java.util.LinkedList;
+import java.util.concurrent.TimeUnit;
 
 import org.glassfish.pfl.tf.spi.annotation.InfoMethod;
 
@@ -79,6 +81,7 @@ private void underflowMessage(String msg, int rid) {
     public ByteBuffer underflow(ByteBuffer byteBuffer) {
 
         ByteBuffer result;
+        long startNanos = System.nanoTime();
 
         synchronized (fragmentQueue) {
 
@@ -87,6 +90,11 @@ public ByteBuffer underflow(ByteBuffer byteBuffer) {
                 throw new RequestCanceledException(cancelReqId);
             }
 
+            ORBData orbData = orb.getORBData();
+            int timeoutMillis = orbData.fragmentReadTimeout();
+            long timeoutNanos = TimeUnit.MILLISECONDS.toNanos(timeoutMillis);
+            long waitNanos = timeoutNanos;
+
             while (fragmentQueue.size() == 0) {
 
                 if (endOfStream) {
@@ -95,12 +103,17 @@ public ByteBuffer underflow(ByteBuffer byteBuffer) {
 
                 boolean interrupted = false;
                 try {
-                    fragmentQueue.wait(orb.getORBData().fragmentReadTimeout());
+                    orbData.waitNanos(fragmentQueue, waitNanos);
                 } catch (InterruptedException e) {
                     interrupted = true;
                 }
 
-                if (!interrupted && fragmentQueue.size() == 0) {
+                // be robust against spurious wakeups: only throw timeout exception if time has really elapsed
+                // or if unable to measure elapsed time because the clock went backwards
+                long elapsedNanos = System.nanoTime() - startNanos;
+                waitNanos = elapsedNanos < 0 ? 0L : timeoutNanos - elapsedNanos;
+
+                if (!interrupted && waitNanos <= 0 && fragmentQueue.size() == 0) {
                     throw wrapper.bufferReadManagerTimeout();
                 }
 

orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java

@@ -30,6 +30,8 @@
 
 import org.glassfish.pfl.basic.contain.Pair ;
 
+import java.util.concurrent.TimeUnit;
+
 // Which attributes should become setters?  NOT everything, but only
 // those that we think might actually be useful to set.  This may change
 // over time.  On the other hande, essentially everything should be readable.
@@ -381,6 +383,10 @@ public void                     setIIOPPrimaryToContactInfo(
     @ManagedAttribute
     @Description( "True if ORBD should not be used in this ORB instance")
     public boolean disableORBD() ;
+
+    default void waitNanos(Object obj, long waitNanos) throws InterruptedException {
+        TimeUnit.NANOSECONDS.timedWait(obj, waitNanos);
+    }
 }
 
 // End of file.

orbmain/src/test/java/com/sun/corba/ee/impl/encoding/EncodingTestBase.java

@@ -299,10 +299,17 @@ static abstract class ORBDataFake implements ORBData {
 
         @Override
         public int fragmentReadTimeout() {
-            if (asynchronousAction != null) asynchronousAction.exec();
             return 1;
         }
 
+        @Override
+        public void waitNanos(Object obj, long waitNanos) throws InterruptedException {
+            if (asynchronousAction != null) {
+                asynchronousAction.exec();
+            }
+            ORBData.super.waitNanos(obj, waitNanos);
+        }
+
         @Override
         public int getGIOPBuffMgrStrategy(GIOPVersion gv) {
             return gv.equals(GIOPVersion.V1_0) ? BufferManagerFactory.GROW : BufferManagerFactory.STREAM;

orbmain/src/test/java/com/sun/corba/ee/impl/transport/TransportTestBase.java

@@ -246,6 +246,11 @@ public int fragmentReadTimeout() {
         public int getMaxReadByteBufferSizeThreshold() {
             return 500;
         }
+
+        @Override
+        public void waitNanos(Object obj, long waitNanos) throws InterruptedException {
+            ORBData.super.waitNanos(obj, waitNanos);
+        }
     }
 
     static abstract class OrbFake extends ORB {