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, 6 insertions, 5 deletions

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 37afd228ca7..b42b8558a7f 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1197,10 +1197,6 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
             _monitor->remove(this);
         }
         _monitor = _monitor->acm(timeout, close, heartbeat);
-        if(_state == StateActive)
-        {
-            _monitor->add(this);
-        }
 
         if(_monitor->getACM().timeout <= 0)
         {
@@ -1210,6 +1206,11 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
         {
             _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic);
         }
+
+        if(_state == StateActive)
+        {
+            _monitor->add(this);
+        }
     }
 }
 
@@ -2483,11 +2484,11 @@ Ice::ConnectionI::setState(State state)
     {
         if(state == StateActive)
         {
-            _monitor->add(this);
             if(_acmLastActivity != IceUtil::Time())
             {
                 _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic);
             }
+            _monitor->add(this);
         }
         else if(_state == StateActive)
         {