ICE-5630 - ACM timeout is broken

- Also refactored the code a bit in java so that the ACMMonitor doesn't
  inherit from runnable.

1 files changed, 10 insertions, 5 deletions

diff --git a/java/src/IceInternal/FactoryACMMonitor.java b/java/src/IceInternal/FactoryACMMonitor.java
index 420513ff9dd..0f9b6d18f00 100644
--- a/java/src/IceInternal/FactoryACMMonitor.java
+++ b/java/src/IceInternal/FactoryACMMonitor.java
@@ -77,8 +77,14 @@ class FactoryACMMonitor implements ACMMonitor
             {
                 _connections.add(connection);
                 assert _future == null;
-                _future = _instance.timer().scheduleAtFixedRate(this, _config.timeout / 2, _config.timeout / 2,
-                    java.util.concurrent.TimeUnit.MILLISECONDS);
+                _future = _instance.timer().scheduleAtFixedRate(new Runnable() {
+                    @Override
+                    public void run()
+                    {
+                        monitorConnections();
+                    }
+                },
+                _config.timeout / 2, _config.timeout / 2, java.util.concurrent.TimeUnit.MILLISECONDS);
             }
             else
             {
@@ -155,9 +161,8 @@ class FactoryACMMonitor implements ACMMonitor
         return connections;
     }
 
-    @Override
-    public void
-    run()
+    private void
+    monitorConnections()
     {
         synchronized(this)
         {