diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/Glacier2/callback/config | 11 | ||||
| -rw-r--r-- | cpp/demo/Glacier2/chat/config | 11 | ||||
| -rw-r--r-- | cpp/demo/Ice/hello/config | 3 | ||||
| -rw-r--r-- | cpp/demo/Ice/invoke/config | 5 | ||||
| -rw-r--r-- | cpp/demo/Ice/latency/config | 4 | ||||
| -rw-r--r-- | cpp/demo/Ice/throughput/config | 4 | ||||
| -rw-r--r-- | cpp/src/Glacier2/Glacier2Router.cpp | 9 |
7 files changed, 23 insertions, 24 deletions
diff --git a/cpp/demo/Glacier2/callback/config b/cpp/demo/Glacier2/callback/config index 6f37260495e..4733647d45c 100644 --- a/cpp/demo/Glacier2/callback/config +++ b/cpp/demo/Glacier2/callback/config @@ -28,13 +28,14 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000 # No active connection management is permitted with Glacier2. # Connections must remain established. # -Ice.ConnectionIdleTime=0 +Ice.ACM.Client=0 +Ice.ACM.Server=0 # -# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, 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 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 diff --git a/cpp/demo/Glacier2/chat/config b/cpp/demo/Glacier2/chat/config index 3c25364fc24..2d09ab276c9 100644 --- a/cpp/demo/Glacier2/chat/config +++ b/cpp/demo/Glacier2/chat/config @@ -22,13 +22,14 @@ Chat.Client.Endpoints= # No active connection management is permitted with Glacier2. # Connections must remain established. # -Ice.ConnectionIdleTime=0 +Ice.ACM.Client=0 +Ice.ACM.Server=0 # -# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, 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 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 diff --git a/cpp/demo/Ice/hello/config b/cpp/demo/Ice/hello/config index 634d2f8b613..39c092f4770 100644 --- a/cpp/demo/Ice/hello/config +++ b/cpp/demo/Ice/hello/config @@ -19,7 +19,8 @@ Ice.Warn.Connections=1 # # We want a faster ACM for this demo. # -Ice.ConnectionIdleTime=10 +Ice.ACM.Client=10 +Ice.ACM.Server=10 # # Network Tracing diff --git a/cpp/demo/Ice/invoke/config b/cpp/demo/Ice/invoke/config index 74db29549bb..7b3ad1cda13 100644 --- a/cpp/demo/Ice/invoke/config +++ b/cpp/demo/Ice/invoke/config @@ -17,11 +17,6 @@ Printer.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 Ice.Warn.Connections=1 # -# We want a faster ACM for this demo. -# -Ice.ConnectionIdleTime=10 - -# # Network Tracing # # 0 = no network tracing diff --git a/cpp/demo/Ice/latency/config b/cpp/demo/Ice/latency/config index b0dea3c0db8..1ab1916e177 100644 --- a/cpp/demo/Ice/latency/config +++ b/cpp/demo/Ice/latency/config @@ -7,5 +7,5 @@ IceSSL.Client.Config=./sslconfig.xml IceSSL.Server.CertPath=../../../certs IceSSL.Server.Config=./sslconfig.xml -Ice.MonitorConnections=0 -Ice.ConnectionIdleTime=0 +Ice.ACM.Client=0 +Ice.ACM.Server=0 diff --git a/cpp/demo/Ice/throughput/config b/cpp/demo/Ice/throughput/config index 510a0583012..567793849cb 100644 --- a/cpp/demo/Ice/throughput/config +++ b/cpp/demo/Ice/throughput/config @@ -7,5 +7,5 @@ IceSSL.Client.Config=./sslconfig.xml IceSSL.Server.CertPath=../../../certs IceSSL.Server.Config=./sslconfig.xml -Ice.MonitorConnections=0 -Ice.ConnectionIdleTime=0 +Ice.ACM.Client=0 +Ice.ACM.Server=0 diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index ab322df495d..b9361e21052 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -277,12 +277,13 @@ Glacier2::RouterService::initializeCommunicator(int& argc, char* argv[]) // No active connection management is permitted with // Glacier2. Connections must remain established. // - defaultProperties->setProperty("Ice.ConnectionIdleTime", "0"); + defaultProperties->setProperty("Ice.ACM.Client", "0"); + defaultProperties->setProperty("Ice.ACM.Server", "0"); // - // Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, - // which we set to 0 above. However, we still want the - // connection monitor thread for AMI timeouts. We only set + // 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. We only set // this value if it hasn't been set explicitly already. // if(defaultProperties->getProperty("Ice.MonitorConnections").empty()) |