diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 4 | ||||
| -rw-r--r-- | java/src/IceInternal/Instance.java | 2 | ||||
| -rw-r--r-- | java/src/IceInternal/OutgoingAsync.java | 1 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 4 | ||||
| -rw-r--r-- | java/src/IceSSL/TransceiverI.java | 2 |
5 files changed, 4 insertions, 9 deletions
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); } } |