Renamed Ice.BackgroundIO to Ice.ThreadInterruptSafe

Fixed some warnings.

19 files changed, 29 insertions, 34 deletions

diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
index a716ec061f7..0ae9d484e0e 100644
--- a/config/PropertyNames.xml
+++ b/config/PropertyNames.xml
@@ -403,7 +403,7 @@ generated from the section label.
         <property name="Warn.UnknownProperties" />
         <property name="Warn.UnusedProperties" />
         <property name="CacheMessageBuffers" />
-        <property name="BackgroundIO" />
+        <property name="ThreadInterruptSafe" />
     </section>
 
     <section name="IceMX">
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index bad41d3a756..1904563332e 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -183,7 +183,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Warn.UnknownProperties", false, 0),
     IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
     IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
-    IceInternal::Property("Ice.BackgroundIO", false, 0),
+    IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
 };
 
 const IceInternal::PropertyArray
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 96409bdd53f..7ad2954e8cb 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs
index d37552c5c59..2d9a6a49570 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/cs/src/Ice/PropertyNames.cs
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -185,7 +185,7 @@ namespace IceInternal
              new Property(@"^Ice\.Warn\.UnknownProperties$", false, null),
              new Property(@"^Ice\.Warn\.UnusedProperties$", false, null),
              new Property(@"^Ice\.CacheMessageBuffers$", false, null),
-             new Property(@"^Ice\.BackgroundIO$", false, null),
+             new Property(@"^Ice\.ThreadInterruptSafe$", false, null),
              null
         };
 
diff --git a/java/demo/Ice/interrupt/config.client b/java/demo/Ice/interrupt/config.client
index 2c25349f5df..93ba30b3ca7 100644
--- a/java/demo/Ice/interrupt/config.client
+++ b/java/demo/Ice/interrupt/config.client
@@ -5,9 +5,9 @@
 TaskManager.Proxy=manager:tcp -p 10000
 
 #
-# BackgroundIO must be enabled to use interrupt.
+# ThreadInterruptSafe must be enabled to use interrupt.
 #
-Ice.BackgroundIO=1
+Ice.ThreadInterruptSafe=1
 
 #
 # Only connect to the localhost interface by default.
diff --git a/java/demo/Ice/interrupt/config.server b/java/demo/Ice/interrupt/config.server
index a03349cff26..9d950f604a5 100644
--- a/java/demo/Ice/interrupt/config.server
+++ b/java/demo/Ice/interrupt/config.server
@@ -6,9 +6,9 @@
 TaskManager.Endpoints=tcp -p 10000
 
 #
-# BackgroundIO must be enabled to use interrupt.
+# ThreadInterruptSafe must be enabled to use interrupt.
 #
-Ice.BackgroundIO=1
+Ice.ThreadInterruptSafe=1
 
 #
 # Only listen on the localhost interface by default.
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 00f7b9a30de..17b426c69cb 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -11,13 +11,9 @@ package Ice;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 import Ice.Instrumentation.InvocationObserver;
 import IceInternal.QueueRequestHandler;
-import IceInternal.RequestHandler;
 import IceInternal.RetryException;
 
 /**
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index a53eb841186..83725c1afdc 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -928,7 +928,7 @@ public final class Instance
 
             _retryQueue = new RetryQueue(this);
 
-            if(_initData.properties.getPropertyAsInt("Ice.BackgroundIO") > 0)
+            if(_initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
             {
                 _queueExecutor = new QueueExecutor(_initData.properties, 
                                                    Util.createThreadName(_initData.properties, "Ice.BackgroundIO"));
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index 1898cadb945..c7d3c60513f 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -598,6 +598,7 @@ public class OutgoingAsync extends OutgoingAsyncBase implements OutgoingAsyncMes
         }
     }
 
+    @Override
     public void cacheMessageBuffers()
     {
         if(_proxy.__reference().getInstance().cacheMessageBuffers() > 0)
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 3de5acfec59..ae6df18f706 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -185,7 +185,7 @@ public final class PropertyNames
         new Property("Ice\\.Warn\\.UnknownProperties", false, null),
         new Property("Ice\\.Warn\\.UnusedProperties", false, null),
         new Property("Ice\\.CacheMessageBuffers", false, null),
-        new Property("Ice\\.BackgroundIO", false, null),
+        new Property("Ice\\.ThreadInterruptSafe", false, null),
         null
     };
 
diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java
index 40bd7e6fab1..c2a63efaf0b 100644
--- a/java/src/IceSSL/TransceiverI.java
+++ b/java/src/IceSSL/TransceiverI.java
@@ -170,7 +170,6 @@ final class TransceiverI implements IceInternal.Transceiver
         //
         // Try to satisfy the request from data we've already decrypted.
         //
-        int pos = buf.b.position();
         fill(buf.b);
 
         //
@@ -210,7 +209,6 @@ final class TransceiverI implements IceInternal.Transceiver
                 }
                 }
 
-                pos = buf.b.position();
                 fill(buf.b);
             }
         }
diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java
index 77c320bc3d3..2ddd551b6ac 100644
--- a/java/test/Ice/adapterDeactivation/Collocated.java
+++ b/java/test/Ice/adapterDeactivation/Collocated.java
@@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application
     {
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
-        if(initData.properties.getPropertyAsInt("Ice.BackgroundIO") > 0)
+        if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
         {
             initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
         }
diff --git a/java/test/Ice/interrupt/Client.java b/java/test/Ice/interrupt/Client.java
index 973f1ab05d5..1c8fc8b6c4d 100644
--- a/java/test/Ice/interrupt/Client.java
+++ b/java/test/Ice/interrupt/Client.java
@@ -33,10 +33,10 @@ public class Client extends test.Util.Application
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
-        // We need to enable the background IO so that Ice is interrupt
-        // safe for this test.
+        // We need to enable the ThreadInterruptSafe property so that Ice is
+        // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.BackgroundIO", "1");
+        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
diff --git a/java/test/Ice/interrupt/Collocated.java b/java/test/Ice/interrupt/Collocated.java
index 1e8468c6f7a..6e164020aee 100644
--- a/java/test/Ice/interrupt/Collocated.java
+++ b/java/test/Ice/interrupt/Collocated.java
@@ -42,10 +42,10 @@ public class Collocated extends test.Util.Application
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
-        // We need to enable the background IO so that Ice is interrupt
-        // safe for this test.
+        // We need to enable the ThreadInterruptSafe property so that Ice is
+        // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.BackgroundIO", "1");
+        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
diff --git a/java/test/Ice/interrupt/Server.java b/java/test/Ice/interrupt/Server.java
index 790b1e6283b..10f8d6f86c3 100644
--- a/java/test/Ice/interrupt/Server.java
+++ b/java/test/Ice/interrupt/Server.java
@@ -34,10 +34,10 @@ public class Server extends test.Util.Application
         initData.properties = Ice.Util.createProperties(argsH);
         initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt");
         //
-        // We need to enable the background IO so that Ice is interrupt
-        // safe for this test.
+        // We need to enable the ThreadInterruptSafe property so that Ice is
+        // interrupt safe for this test.
         //
-        initData.properties.setProperty("Ice.BackgroundIO", "1");
+        initData.properties.setProperty("Ice.ThreadInterruptSafe", "1");
         //
         // We need to send messages large enough to cause the transport
         // buffers to fill up.
diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/Ice/metrics/AllTests.java
index b54fee3dbad..48d1fdb8a80 100644
--- a/java/test/Ice/metrics/AllTests.java
+++ b/java/test/Ice/metrics/AllTests.java
@@ -425,7 +425,7 @@ public class AllTests
         boolean collocated = metrics.ice_getConnection() == null;
 
         int threadCount = 4;
-        if(collocated && communicator.getProperties().getPropertyAsInt("Ice.BackgroundIO") > 0)
+        if(collocated && communicator.getProperties().getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
         {
             threadCount = 6;
         }
diff --git a/java/test/Ice/metrics/Collocated.java b/java/test/Ice/metrics/Collocated.java
index 6fbfa9f4154..e1191a4de99 100644
--- a/java/test/Ice/metrics/Collocated.java
+++ b/java/test/Ice/metrics/Collocated.java
@@ -46,7 +46,7 @@ public class Collocated extends test.Util.Application
     {
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
-        if(initData.properties.getPropertyAsInt("Ice.BackgroundIO") > 0)
+        if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
         {
             // With background IO, collocated invocations are
             // dispatched on the server thread pool. This test needs
diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 278e81a9b65..ecfab090c8c 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -35,7 +35,7 @@ public class Collocated extends test.Util.Application
     {
         Ice.InitializationData initData = new Ice.InitializationData();
         initData.properties = Ice.Util.createProperties(argsH);
-        if(initData.properties.getPropertyAsInt("Ice.BackgroundIO") > 0)
+        if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0)
         {
             initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2");
         }
diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js
index 239ea768e29..ff6f7052e08 100644
--- a/js/src/Ice/PropertyNames.js
+++ b/js/src/Ice/PropertyNames.js
@@ -6,7 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 29 09:49:33 2014
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -186,7 +186,7 @@ PropertyNames.IceProps =
     new Property("/^Ice\.Warn\.UnknownProperties/", false, null),
     new Property("/^Ice\.Warn\.UnusedProperties/", false, null),
     new Property("/^Ice\.CacheMessageBuffers/", false, null),
-    new Property("/^Ice\.BackgroundIO/", false, null),
+    new Property("/^Ice\.ThreadInterruptSafe/", false, null),
 ];
 
 /* jshint +W044*/