Ice.Warn.Connection -> Ice.Warn.Connections

16 files changed, 16 insertions, 16 deletions

diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py
index 520e4e4d424..d2c13c64801 100644
--- a/java/config/TestUtil.py
+++ b/java/config/TestUtil.py
@@ -116,7 +116,7 @@ else:
     defaultHost = ""
 
 commonServerOptions = " --Ice.PrintAdapterReady --Ice.ServerThreadPool.Size=3" + \
-                      " --Ice.Warn.Connection --Ice.ServerIdleTime=30"
+                      " --Ice.Warn.Connections --Ice.ServerIdleTime=30"
 
 clientOptions = clientProtocol + defaultHost
 serverOptions = serverProtocol + defaultHost + commonServerOptions
diff --git a/java/demo/Freeze/library/config b/java/demo/Freeze/library/config
index 42a92e7bf94..099499d99c1 100644
--- a/java/demo/Freeze/library/config
+++ b/java/demo/Freeze/library/config
@@ -1,5 +1,5 @@
 Library.Endpoints=default -p 10000
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
 #Ice.Trace.Network=3
 #Ice.Trace.Protocol=1
 Library.Proxy=library:default -p 10000
diff --git a/java/demo/Freeze/phonebook/config b/java/demo/Freeze/phonebook/config
index 422f5ade269..4488fc30f62 100644
--- a/java/demo/Freeze/phonebook/config
+++ b/java/demo/Freeze/phonebook/config
@@ -1,5 +1,5 @@
 PhoneBook.Endpoints=default -p 10000
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
 #Ice.Trace.Network=3
 #Ice.Trace.Protocol=1
 PhoneBook.Proxy=phonebook:default -p 10000
diff --git a/java/demo/Glacier/session/config b/java/demo/Glacier/session/config
index c3de77180b1..ddbbddf971f 100644
--- a/java/demo/Glacier/session/config
+++ b/java/demo/Glacier/session/config
@@ -1,6 +1,6 @@
 HelloSessionManager.Endpoints=tcp -p 10000:udp -p 10000
 
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
 Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
 
diff --git a/java/demo/Ice/callback/config b/java/demo/Ice/callback/config
index c0a5378dec4..00dcc743704 100644
--- a/java/demo/Ice/callback/config
+++ b/java/demo/Ice/callback/config
@@ -3,7 +3,7 @@ Callback.Client.Endpoints=tcp:udp
 
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
 
 Glacier.Router.Endpoints=default -p 10005
 Glacier.Router.Client.Endpoints=tcp:udp -c
diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
index 86204dd171a..7aa0fe8e4fb 100644
--- a/java/demo/Ice/callback/config.server
+++ b/java/demo/Ice/callback/config.server
@@ -2,4 +2,4 @@ Callback.Server.Endpoints=tcp -p 10000:udp -p 10000
 
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
diff --git a/java/demo/Ice/hello/config b/java/demo/Ice/hello/config
index 6420702fd76..a0886b504b3 100644
--- a/java/demo/Ice/hello/config
+++ b/java/demo/Ice/hello/config
@@ -14,7 +14,7 @@ Hello.Endpoints=tcp -p 10000:udp -p 10000
 #
 # Warn about connection exceptions
 #
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/demo/Ice/nested/config b/java/demo/Ice/nested/config
index 53785cf92f4..e6de41b21c4 100644
--- a/java/demo/Ice/nested/config
+++ b/java/demo/Ice/nested/config
@@ -5,7 +5,7 @@ Ice.ServerThreadPool.Size=50
 #Ice.Trace.Security=2
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
-#Ice.Warn.Connection=1
+#Ice.Warn.Connections=1
 
 Glacier.Router.Endpoints=default -p 10005
 Glacier.Client.Endpoints=default
diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server
index 9e13f5d35be..13531882d26 100644
--- a/java/demo/Ice/nested/config.server
+++ b/java/demo/Ice/nested/config.server
@@ -4,4 +4,4 @@ Ice.ServerThreadPool.Size=50
 #Ice.Trace.Security=6
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
-#Ice.Warn.Connection=1
+#Ice.Warn.Connections=1
diff --git a/java/demo/IceBox/hello/config b/java/demo/IceBox/hello/config
index ea79a854b8c..7ae20004d09 100644
--- a/java/demo/IceBox/hello/config
+++ b/java/demo/IceBox/hello/config
@@ -24,7 +24,7 @@ Ice.Adapter.HelloAdapter.Endpoints=tcp -p 10000:udp -p 10000
 #
 # Warn about connection exceptions
 #
-Ice.Warn.Connection=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/src/IceInternal/Connection.java b/java/src/IceInternal/Connection.java
index 9501dc4c8ab..f78ee3d08d8 100644
--- a/java/src/IceInternal/Connection.java
+++ b/java/src/IceInternal/Connection.java
@@ -738,7 +738,7 @@ public final class Connection extends EventHandler
         _adapter = adapter;
         _logger = instance.logger();
         _traceLevels = instance.traceLevels();
-	_warn = _instance.properties().getPropertyAsInt("Ice.Warn.Connection") > 0 ? true : false;
+	_warn = _instance.properties().getPropertyAsInt("Ice.Warn.Connections") > 0 ? true : false;
         _nextRequestId = 1;
         _batchStream = new BasicStream(instance);
         _responseCount = 0;
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index dbe4ce52411..5bb7816ef96 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -208,7 +208,7 @@ public class IncomingConnectionFactory extends EventHandler
         super(instance);
         _endpoint = endpoint;
         _adapter = adapter;
-	_warn = _instance.properties().getPropertyAsInt("Ice.Warn.Connection") > 0 ? true : false;
+	_warn = _instance.properties().getPropertyAsInt("Ice.Warn.Connections") > 0 ? true : false;
         _state = StateHolding;
 	_registeredWithPool = false;
 
diff --git a/java/test/Glacier/starter/CallbackClient.java b/java/test/Glacier/starter/CallbackClient.java
index 8fb31387be1..71968821d19 100644
--- a/java/test/Glacier/starter/CallbackClient.java
+++ b/java/test/Glacier/starter/CallbackClient.java
@@ -146,7 +146,7 @@ class CallbackClient extends Ice.Application
         System.out.flush();
         twoway.shutdown();
         // No ping, otherwise the glacier router prints a warning
-        // message if it's started with --Ice.Warn.Connection.
+        // message if it's started with --Ice.Warn.Connections.
         System.out.println("ok");
         /*
         try
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index 22bd30709a8..378c4b19d42 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -18,7 +18,7 @@ public class Server
     run(String[] args, Ice.Communicator communicator)
     {
         Ice.Properties properties = communicator.getProperties();
-        properties.setProperty("Ice.Warn.Connection", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
         properties.setProperty("TestAdapter.Endpoints", "default -p 12345 -t 2000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new ThrowerI(adapter);
diff --git a/java/test/IcePack/deployer/icebox.xml b/java/test/IcePack/deployer/icebox.xml
index 36738c5860a..7801f10d911 100644
--- a/java/test/IcePack/deployer/icebox.xml
+++ b/java/test/IcePack/deployer/icebox.xml
@@ -4,7 +4,7 @@
   <service name="Service2" descriptor="freezeservice.xml"/>
 
   <properties>
-    <property name="Ice.Warn.Connection" value="1"/>
+    <property name="Ice.Warn.Connections" value="1"/>
   </properties>
 
 </server>
\ No newline at end of file
diff --git a/java/test/IcePack/deployer/server.xml b/java/test/IcePack/deployer/server.xml
index b3460bf1b40..812a1b8c7f8 100644
--- a/java/test/IcePack/deployer/server.xml
+++ b/java/test/IcePack/deployer/server.xml
@@ -16,7 +16,7 @@
   <properties>
     <property name="Type" value="Server"/>
     <property name="Name" value="${name}"/>
-    <property name="Ice.Warn.Connection" value="1"/>
+    <property name="Ice.Warn.Connections" value="1"/>
   </properties>
 
 </server>
\ No newline at end of file