1 files changed, 11 insertions, 11 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
index 6646e435d15..6c041f0a76b 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/IncomingConnectionFactory.java
@@ -373,6 +373,17 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice
             {
                 closeAcceptor();
             }
+
+            //
+            // If the acceptor got closed because of an un-expected error, try to restart it in 1 second.
+            //
+            _instance.timer().schedule(new Runnable()
+                                       {
+                                            public void run()
+                                            {
+                                                startAcceptor();
+                                            }
+                                       }, 1, java.util.concurrent.TimeUnit.SECONDS);
             return;
         }
 
@@ -718,17 +729,6 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice
 
         _acceptorStarted = false;
         _acceptor.close();
-
-        if(_state == StateHolding || _state == StateActive)
-        {
-            _instance.timer().schedule(new Runnable()
-                                       {
-                                            public void run()
-                                            {
-                                                startAcceptor();
-                                            }
-                                       }, 1, java.util.concurrent.TimeUnit.SECONDS);
-        }
     }
 
     private void