- begin_ now never interrupts.

- All potentially blocking Ice APIs are interruption points.
- Fixes to the incoming/outgoing factories and shutdown procedure
- Fixed bug where connect() was from a user thread.
- Added lots more tests to the interrupt test suite.

1 files changed, 7 insertions, 0 deletions

diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index 38846212228..4f251b111f3 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -155,6 +155,11 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
     @Override
     synchronized public void close(boolean force)
     {
+        if(Thread.interrupted())
+        {
+            throw new Ice.OperationInterruptedException();
+        }
+
         if(force)
         {
             setState(StateClosed, new ForcedCloseConnectionException());
@@ -645,6 +650,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
         {
             result.invokeExceptionAsync(__ex);
         }
+
         return result;
     }
 
@@ -2567,6 +2573,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
 
                 case IceInternal.Protocol.replyMsg:
                 {
+                    
                     IceInternal.TraceUtil.traceRecv(info.stream, _logger, _traceLevels);
                     info.requestId = info.stream.readInt();
                     IceInternal.OutgoingAsync outAsync = _asyncRequests.remove(info.requestId);