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/ConnectionACMMonitor.java b/java/src/IceInternal/ConnectionACMMonitor.java
index 38c57189dd9..c0a135123fa 100644
--- a/java/src/IceInternal/ConnectionACMMonitor.java
+++ b/java/src/IceInternal/ConnectionACMMonitor.java
@@ -45,8 +45,14 @@ class ConnectionACMMonitor implements ACMMonitor
         _connection = connection;
         if(_config.timeout > 0)
         {
-            _future = _timer.scheduleAtFixedRate(this, _config.timeout / 2, _config.timeout / 2,
-                java.util.concurrent.TimeUnit.MILLISECONDS);
+            _future = _timer.scheduleAtFixedRate(new Runnable() {
+                @Override
+                public void run()
+                {
+                    monitorConnection();
+                }
+            },
+            _config.timeout / 2, _config.timeout / 2, java.util.concurrent.TimeUnit.MILLISECONDS);
         }
     }
 
@@ -88,9 +94,8 @@ class ConnectionACMMonitor implements ACMMonitor
         return acm;
     }
 
-    @Override
-    public void
-    run()
+    private void
+    monitorConnection()
     {
         Ice.ConnectionI connection;
         synchronized(this)