Finished fixes for bug 2132

6 files changed, 10 insertions, 20 deletions

diff --git a/cpp/CHANGES b/cpp/CHANGES
index aed6ab9a646..3ebc0137281 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,12 @@
 Changes since version 3.2.X (binary incompatible)
 -------------------------------------------------
 
+- AMI timeouts are no longer triggered by the connection monitor
+  thread at regular time intervals. Instead, timeouts are now
+  triggered on time like for synchronous invocations. As a result, the
+  setting of the Ice.MonitorConnections is no longer useful and this
+  property has been deprecated.
+
 - Network tracing now also includes failures to connect if
   the Ice.Trace.Network property is set to 2.
 
diff --git a/cpp/demo/Glacier2/callback/config.client b/cpp/demo/Glacier2/callback/config.client
index e3477480a22..6a021819a09 100644
--- a/cpp/demo/Glacier2/callback/config.client
+++ b/cpp/demo/Glacier2/callback/config.client
@@ -31,14 +31,6 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
 Ice.ACM.Client=0
 
 #
-# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
-# Ice.ACM.Server, which we set to 0 above. However we still want the
-# connection monitor thread for AMI timeouts (for completeness, even
-# if this demo doesn't use AMI).
-#
-Ice.MonitorConnections=60
-
-#
 # Connection retry is not possible with Glacier2. Connections must
 # remain established.
 #
diff --git a/cpp/demo/Glacier2/chat/config.client b/cpp/demo/Glacier2/chat/config.client
index aa60fe32325..e7916b6b81f 100644
--- a/cpp/demo/Glacier2/chat/config.client
+++ b/cpp/demo/Glacier2/chat/config.client
@@ -25,14 +25,6 @@ Chat.Client.Endpoints=
 Ice.ACM.Client=0
 
 #
-# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
-# Ice.ACM.Server, which we set to 0 above. However we still want the
-# connection monitor thread for AMI timeouts (for completeness, even
-# if this demo doesn't use AMI).
-#
-Ice.MonitorConnections=60
-
-#
 # Connection retry is not possible with Glacier2. Connections must
 # remain established.
 #
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 00636a8f1e3..17e4df91d15 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Nov 29 17:38:46 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Jan  7 11:13:34 2008
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -73,7 +73,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.ImplicitContext", false, 0),
     IceInternal::Property("Ice.InitPlugins", false, 0),
     IceInternal::Property("Ice.MessageSizeMax", false, 0),
-    IceInternal::Property("Ice.MonitorConnections", false, 0),
+    IceInternal::Property("Ice.MonitorConnections", true, 0),
     IceInternal::Property("Ice.Nohup", false, 0),
     IceInternal::Property("Ice.NullHandleAbort", false, 0),
     IceInternal::Property("Ice.Override.Compress", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 34a3bb3af23..a9c885f395d 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Nov 29 17:38:46 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Jan  7 11:13:34 2008
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 28e3f5fa3ab..45a88f9478b 100755
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1904,7 +1904,7 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa
         // properly. We do this before initializing the communicator because we need to
         // ensure that signals are initialized before additional threads are created. The
         // communicator thread pools currently use lazy initialization, but a thread can
-        // be created if Ice.MonitorConnections is defined.
+        // be created to monitor connections.
         //
         _ctrlCHandler = new IceUtil::CtrlCHandler;