- 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, 20 insertions, 0 deletions

diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 11eb4225e14..a9b21feab3e 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -143,6 +143,11 @@ public final class ObjectAdapterI implements ObjectAdapter
     public void
     waitForHold()
     {
+        if(Thread.interrupted())
+        {
+            throw new Ice.OperationInterruptedException();
+        }
+
         while(true)
         {
             java.util.List<IceInternal.IncomingConnectionFactory> incomingConnectionFactories;
@@ -218,6 +223,11 @@ public final class ObjectAdapterI implements ObjectAdapter
     public void
     deactivate()
     {
+        if(Thread.interrupted())
+        {
+            throw new Ice.OperationInterruptedException();
+        }
+
         IceInternal.OutgoingConnectionFactory outgoingConnectionFactory;
         java.util.List<IceInternal.IncomingConnectionFactory> incomingConnectionFactories;
         IceInternal.LocatorInfo locatorInfo;
@@ -310,6 +320,11 @@ public final class ObjectAdapterI implements ObjectAdapter
     public void
     waitForDeactivate()
     {
+        if(Thread.interrupted())
+        {
+            throw new Ice.OperationInterruptedException();
+        }
+
         try
         {
             IceInternal.IncomingConnectionFactory[] incomingConnectionFactories;
@@ -360,6 +375,11 @@ public final class ObjectAdapterI implements ObjectAdapter
     public void
     destroy()
     {
+        if(Thread.interrupted())
+        {
+            throw new Ice.OperationInterruptedException();
+        }
+
         synchronized(this)
         {
             //