1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index 5b9688a70d7..63c3e592669 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -144,6 +144,11 @@ public final class ObjectAdapterFactory
     public synchronized Ice.ObjectAdapter
     createObjectAdapter(String name, Ice.RouterPrx router)
     {
+        if(Thread.interrupted())
+        {
+            throw new Ice.OperationInterruptedException();
+        }
+
         if(_instance == null)
         {
             throw new Ice.ObjectAdapterDeactivatedException();