diff options
author | Benoit Foucher <benoit@zeroc.com> | 2019-09-20 10:30:56 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2019-09-20 10:30:56 +0200 |
commit | f62cf195d09957c86e46015c8153a3c6f13eede7 (patch) | |
tree | e5f346b3a267e191684f5c9bb25752b0034437c6 /java-compat | |
parent | Fixed arc run instructions (diff) | |
download | ice-f62cf195d09957c86e46015c8153a3c6f13eede7.tar.bz2 ice-f62cf195d09957c86e46015c8153a3c6f13eede7.tar.xz ice-f62cf195d09957c86e46015c8153a3c6f13eede7.zip |
Fixed Java warnings reported by Eclipse, fixes #541
Diffstat (limited to 'java-compat')
8 files changed, 10 insertions, 12 deletions
diff --git a/java-compat/src/Ice/src/main/java/Ice/InputStream.java b/java-compat/src/Ice/src/main/java/Ice/InputStream.java index ebdcdc9e3fd..2979f04a29a 100644 --- a/java-compat/src/Ice/src/main/java/Ice/InputStream.java +++ b/java-compat/src/Ice/src/main/java/Ice/InputStream.java @@ -1655,7 +1655,6 @@ public class InputStream } final static java.nio.charset.Charset _utf8 = java.nio.charset.Charset.forName("UTF8"); - private java.nio.charset.CharsetEncoder _charEncoder = null; /** * Extracts a string from the stream. diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java index 70ee6a66273..3491746bbc6 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java @@ -7,9 +7,6 @@ package Ice; import java.util.LinkedList; import java.util.List; -import Ice.Instrumentation.InvocationObserver; -import IceInternal.RetryException; - /** * Base class for all proxies. **/ diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java index 87bcc6515bf..f23437277fa 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPool.java @@ -76,8 +76,6 @@ public final class ThreadPool } } - private static ThreadPoolWorkItem _interruptWorkItem = new InterruptWorkItem(); - // // Exception raised by the thread pool work queue when the thread pool // is destroyed. diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java index 5b14d26f0f8..55aef3821fd 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ThreadPoolWorkQueue.java @@ -4,8 +4,6 @@ package IceInternal; -import java.util.List; - final class ThreadPoolWorkQueue extends EventHandler { ThreadPoolWorkQueue(Instance instance, ThreadPool threadPool, Selector selector) diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java index 6cdecaa8f8c..300bc260846 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpMulticastServerTransceiver.java @@ -385,7 +385,6 @@ final class UdpMulticastServerTransceiver implements Transceiver while(true) { MulticastSocket socket; - int size; Buffer buf = null; synchronized(this) diff --git a/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java b/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java index 9dc9b57de17..5a102058951 100644 --- a/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java +++ b/java-compat/src/Ice/src/main/java/IceSSL/TransceiverI.java @@ -390,6 +390,11 @@ final class TransceiverI implements IceInternal.Transceiver { break; } + default: // 1.9 introduced NEEDS_UNWRAP_AGAIN for DTLS + { + assert(false); + break; + } } break; } @@ -414,6 +419,11 @@ final class TransceiverI implements IceInternal.Transceiver status = result.getHandshakeStatus(); break; } + default: // 1.9 introduced NEEDS_UNWRAP_AGAIN for DTLS + { + assert(false); + break; + } } if(result != null) diff --git a/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java b/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java index 0cf8d275686..888c145e5f6 100644 --- a/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java +++ b/java-compat/src/IceBT/src/main/java/IceBT/ConnectorI.java @@ -4,8 +4,6 @@ package IceBT; -import java.util.UUID; - final class ConnectorI implements IceInternal.Connector { @Override diff --git a/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java b/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java index 01f40dbe542..93c59dcef81 100644 --- a/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java +++ b/java-compat/src/IceBT/src/main/java/IceBT/TransceiverI.java @@ -6,7 +6,6 @@ package IceBT; import java.lang.Thread; import java.nio.ByteBuffer; -import java.nio.channels.*; import java.util.UUID; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; |