diff options
76 files changed, 126 insertions, 158 deletions
diff --git a/android/build.gradle b/android/build.gradle index 5fe204941cd..d71c01d3e40 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,10 +20,10 @@ subprojects { apply plugin: 'idea' // The Android versions used by subprojects. - ext.ice_compileSdkVersion = 21 + ext.ice_compileSdkVersion = 17 ext.ice_buildToolsVersion = "21.1.0" - ext.ice_minSdkVersion = 21 - ext.ice_targetSdkVersion = 21 + ext.ice_minSdkVersion = 17 + ext.ice_targetSdkVersion = 17 repositories { maven { diff --git a/android/test/android/build.gradle b/android/test/android/build.gradle index c013be1c3df..57f653c6d19 100644 --- a/android/test/android/build.gradle +++ b/android/test/android/build.gradle @@ -32,7 +32,7 @@ android { } release { - runProguard true + runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' } } diff --git a/android/test/android/proguard.cfg b/android/test/android/proguard.cfg index 4f1735013b0..4733d92557f 100644 --- a/android/test/android/proguard.cfg +++ b/android/test/android/proguard.cfg @@ -63,14 +63,16 @@ -keepnames class ** { *; } --keep class test.Ice.** { - *; -} --keep interface test.Ice.** --keep interface Ice.** --keep interface IceInternal.** --keep class Ice.** --keep class IceInternal.** +-keep class test.Ice.** { *; } + +-keep class Ice.** { *; } +-keep enum Ice.** { *; } + +-keep class IceSSL.** { *; } +-keep enum IceSSL.** { *; } + +-keep class IceInternal.** { *; } +-keep enum IceInternal.** { *; } # For debugging. -keepattributes LocalVariableTable, LocalVariableTypeTable diff --git a/java/.idea/vcs.xml b/java/.idea/vcs.xml index def6a6a1845..075f87f36ac 100644 --- a/java/.idea/vcs.xml +++ b/java/.idea/vcs.xml @@ -2,6 +2,6 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="" /> + <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> </component> -</project> - +</project>
\ No newline at end of file diff --git a/java/demo/.gitignore b/java/demo/.gitignore deleted file mode 100644 index 8995b8b1d68..00000000000 --- a/java/demo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.depend diff --git a/java/demo/Ice/applet/.gitignore b/java/demo/Ice/applet/.gitignore deleted file mode 100644 index e5786e5ddd4..00000000000 --- a/java/demo/Ice/applet/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Hello.jar diff --git a/java/demo/Ice/optional/.gitignore b/java/demo/Ice/optional/.gitignore deleted file mode 100644 index 7a51764475c..00000000000 --- a/java/demo/Ice/optional/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -Contact.cpp -Contact.h diff --git a/java/demo/Ice/swing/.gitignore b/java/demo/Ice/swing/.gitignore deleted file mode 100644 index e5786e5ddd4..00000000000 --- a/java/demo/Ice/swing/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Hello.jar diff --git a/java/src/Ice/src/main/java/Ice/Application.java b/java/src/Ice/src/main/java/Ice/Application.java index ab9a72f272d..546e7893ed8 100644 --- a/java/src/Ice/src/main/java/Ice/Application.java +++ b/java/src/Ice/src/main/java/Ice/Application.java @@ -575,7 +575,7 @@ public abstract class Application } protected boolean _done = false; - protected java.lang.Object _doneMutex = new java.lang.Object(); + protected final java.lang.Object _doneMutex = new java.lang.Object(); } static class DestroyHook extends AppHook @@ -688,7 +688,7 @@ public abstract class Application protected static String _appName; protected static Communicator _communicator; protected static AppHook _appHook; - protected static java.lang.Object _mutex = new java.lang.Object(); + protected final static java.lang.Object _mutex = new java.lang.Object(); protected static boolean _callbackInProgress = false; protected static boolean _destroyed = false; protected static boolean _interrupted = false; diff --git a/java/src/Ice/src/main/java/Ice/ConnectionI.java b/java/src/Ice/src/main/java/Ice/ConnectionI.java index 5a12142973e..9e465d33e2f 100644 --- a/java/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/Ice/ConnectionI.java @@ -102,7 +102,6 @@ public final class ConnectionI extends IceInternal.EventHandler { exception(ex); waitUntilFinished(); - return; } } @@ -3148,7 +3147,7 @@ public final class ConnectionI extends IceInternal.EventHandler private boolean _validated = false; private IceInternal.Incoming _incomingCache; - private java.lang.Object _incomingCacheMutex = new java.lang.Object(); + private final java.lang.Object _incomingCacheMutex = new java.lang.Object(); private Ice.ProtocolVersion _readProtocol = new Ice.ProtocolVersion(); private Ice.EncodingVersion _readProtocolEncoding = new Ice.EncodingVersion(); diff --git a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java index d00a347731a..5e228fd22cd 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.ArrayList; import IceInternal.IncomingConnectionFactory; -import IceInternal.OutgoingConnectionFactory; public final class ObjectAdapterI implements ObjectAdapter { diff --git a/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java b/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java index 27f8b15014a..74d3a204103 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/src/main/java/Ice/ObjectPrxHelperBase.java @@ -13,7 +13,6 @@ import java.util.LinkedList; import java.util.List; import Ice.Instrumentation.InvocationObserver; -import IceInternal.QueueRequestHandler; import IceInternal.RetryException; /** @@ -254,7 +253,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable return begin_ice_isA(__id, __context, true, false, __responseCb, __exceptionCb, __sentCb); } - private final AsyncResult + private AsyncResult begin_ice_isA(String __id, java.util.Map<String, String> __context, boolean __explicitCtx, @@ -334,7 +333,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } - static public final void __ice_isA_completed(TwowayCallbackBool __cb, Ice.AsyncResult __result) + static public void __ice_isA_completed(TwowayCallbackBool __cb, Ice.AsyncResult __result) { boolean __ret = false; try @@ -825,7 +824,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } - static public final void __ice_ids_completed(TwowayCallbackArg1<String[]> __cb, AsyncResult __result) + static public void __ice_ids_completed(TwowayCallbackArg1<String[]> __cb, AsyncResult __result) { String[] __ret = null; try @@ -1100,7 +1099,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } - static public final void __ice_id_completed(TwowayCallbackArg1<String> __cb, AsyncResult __result) + static public void __ice_id_completed(TwowayCallbackArg1<String> __cb, AsyncResult __result) { String __ret = null; try @@ -1396,7 +1395,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable return begin_ice_invoke(operation, mode, inParams, context, true, false, responseCb, exceptionCb, null); } - private final AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, + private AsyncResult begin_ice_invoke(String operation, OperationMode mode, byte[] inParams, java.util.Map<String, String> __context, boolean __explicitCtx, boolean __synchronous, @@ -2354,8 +2353,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_getConnection() { - AsyncResult result = begin_ice_getConnectionInternal(null); - return result; + return begin_ice_getConnectionInternal(null); } /** @@ -2368,8 +2366,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_getConnection(Callback __cb) { - AsyncResult result = begin_ice_getConnectionInternal(__cb); - return result; + return begin_ice_getConnectionInternal(__cb); } /** @@ -2382,8 +2379,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_getConnection(Callback_Object_ice_getConnection __cb) { - AsyncResult result = begin_ice_getConnectionInternal(__cb); - return result; + return begin_ice_getConnectionInternal(__cb); } private class FunctionalCallback_Object_ice_getConnection @@ -2446,7 +2442,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable return ice_getCachedConnection(); } - static public final void __ice_getConnection_completed(TwowayCallbackArg1<Ice.Connection> cb, AsyncResult result) + static public void __ice_getConnection_completed(TwowayCallbackArg1<Ice.Connection> cb, AsyncResult result) { Ice.Connection ret = null; try @@ -2519,8 +2515,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_flushBatchRequests() { - AsyncResult result = begin_ice_flushBatchRequestsInternal(null); - return result; + return begin_ice_flushBatchRequestsInternal(null); } /** @@ -2533,8 +2528,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_flushBatchRequests(Callback __cb) { - AsyncResult result = begin_ice_flushBatchRequestsInternal(__cb); - return result; + return begin_ice_flushBatchRequestsInternal(__cb); } /** @@ -2547,8 +2541,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable public AsyncResult begin_ice_flushBatchRequests(Callback_Object_ice_flushBatchRequests __cb) { - AsyncResult result = begin_ice_flushBatchRequestsInternal(__cb); - return result; + return begin_ice_flushBatchRequestsInternal(__cb); } /** @@ -2964,7 +2957,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } - private final ObjectPrxHelperBase + private ObjectPrxHelperBase newInstance(IceInternal.Reference ref) { try diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java index 9bf7dacae1d..5e464ac28c7 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1.java @@ -17,4 +17,4 @@ public interface TwowayCallbackArg1<T> extends TwowayCallback * @param arg The operation return value. **/ void response(T arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java index b157b5d6555..75cc8c397a4 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackArg1UE.java @@ -17,4 +17,4 @@ public interface TwowayCallbackArg1UE<T> extends TwowayCallbackArg1<T> * @param ex The user exception raised by the operation. **/ void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackBool.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackBool.java index 0c737e027a3..f723188b13c 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackBool.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackBool.java @@ -17,4 +17,4 @@ public interface TwowayCallbackBool extends TwowayCallback * @param arg The operation return value. **/ void response(boolean arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java index f94fdc42190..50f90235992 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackBoolUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackBoolUE extends TwowayCallbackBool { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackByte.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackByte.java index a08eb9bd377..66cb6fc7ad1 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackByte.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackByte.java @@ -17,4 +17,4 @@ public interface TwowayCallbackByte extends TwowayCallback * @param arg The operation return value. **/ void response(byte arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java index 7154f9e2a62..f593d8d9ebd 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackByteUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackByteUE extends TwowayCallbackByte { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java index 852d4c0a969..e870aa965ce 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackDouble.java @@ -17,4 +17,4 @@ public interface TwowayCallbackDouble extends TwowayCallback * @param arg The operation return value. **/ void response(double arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java index 295ee63d16d..e1b0b0452c9 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackDoubleUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackDoubleUE extends TwowayCallbackDouble { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java index effe49dff51..21bd4f96e5d 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloat.java @@ -17,4 +17,4 @@ public interface TwowayCallbackFloat extends TwowayCallback * @param arg The operation return value. **/ void response(float arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java index 4a2018c842b..3d3a6f216c7 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackFloatUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackFloatUE extends TwowayCallbackFloat { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackInt.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackInt.java index cd15516426a..ad9470ee437 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackInt.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackInt.java @@ -17,4 +17,4 @@ public interface TwowayCallbackInt extends TwowayCallback * @param arg The operation return value. **/ void response(int arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java index a70ebcaef02..d8569f9fe4f 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackIntUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackIntUE extends TwowayCallbackInt { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackLong.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackLong.java index 3a6106613cd..3a3db4bb51b 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackLong.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackLong.java @@ -17,4 +17,4 @@ public interface TwowayCallbackLong extends TwowayCallback * @param arg The operation return value. **/ void response(long arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java index f238fb49bce..858e649d31b 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackLongUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackLongUE extends TwowayCallbackLong { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackShort.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackShort.java index 7fd705ff950..4fdbf360ebf 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackShort.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackShort.java @@ -17,4 +17,4 @@ public interface TwowayCallbackShort extends TwowayCallback * @param arg The operation return value. **/ void response(short arg); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java index ffff7e63ce7..07d6407c01e 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackShortUE.java @@ -12,4 +12,4 @@ package Ice; public interface TwowayCallbackShortUE extends TwowayCallbackShort { void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java b/java/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java index 7bcbf69b5ad..87eea175286 100644 --- a/java/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java +++ b/java/src/Ice/src/main/java/Ice/TwowayCallbackVoidUE.java @@ -22,4 +22,4 @@ public interface TwowayCallbackVoidUE extends TwowayCallback * @param ex The user exception raised by the operation. **/ void exception(Ice.UserException ex); -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/ACMConfig.java b/java/src/Ice/src/main/java/IceInternal/ACMConfig.java index f7dcf5653cb..5dd38880df6 100644 --- a/java/src/Ice/src/main/java/IceInternal/ACMConfig.java +++ b/java/src/Ice/src/main/java/IceInternal/ACMConfig.java @@ -31,7 +31,7 @@ public final class ACMConfig implements java.lang.Cloneable else { timeoutProperty = prefix + ".Timeout"; - }; + } timeout = p.getPropertyAsIntWithDefault(timeoutProperty, dflt.timeout / 1000) * 1000; // To milliseconds @@ -79,4 +79,4 @@ public final class ACMConfig implements java.lang.Cloneable public int timeout; public Ice.ACMHeartbeat heartbeat; public Ice.ACMClose close; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/ACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/ACMMonitor.java index 7b9fad1bc3d..d8c86cbbf4e 100644 --- a/java/src/Ice/src/main/java/IceInternal/ACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/ACMMonitor.java @@ -17,4 +17,4 @@ public interface ACMMonitor ACMMonitor acm(Ice.IntOptional timeout, Ice.Optional<Ice.ACMClose> close, Ice.Optional<Ice.ACMHeartbeat> heartbeat); Ice.ACM getACM(); -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java b/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java index 6c31dfb8e38..d4b7b8621a4 100644 --- a/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java +++ b/java/src/Ice/src/main/java/IceInternal/AsyncResultI.java @@ -429,7 +429,7 @@ public class AsyncResultI implements AsyncResult } } - private final void warning(RuntimeException ex) + private void warning(RuntimeException ex) { if(_instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0) { @@ -438,7 +438,7 @@ public class AsyncResultI implements AsyncResult } } - private final void error(Error error) + private void error(Error error) { String s = "error raised by AMI callback:\n" + Ex.toString(error); _instance.initializationData().logger.error(s); diff --git a/java/src/Ice/src/main/java/IceInternal/BasicStream.java b/java/src/Ice/src/main/java/IceInternal/BasicStream.java index 58620c59170..bba95e26f69 100644 --- a/java/src/Ice/src/main/java/IceInternal/BasicStream.java +++ b/java/src/Ice/src/main/java/IceInternal/BasicStream.java @@ -4086,11 +4086,12 @@ public class BasicStream final InstanceData previous; InstanceData next; - }; + } + private InstanceData _current; private int _objectIdIndex; // The ID of the next object to un-marshal. - }; + } abstract private static class EncapsEncoder { @@ -4147,7 +4148,7 @@ public class BasicStream // Encapsulation attributes for object marshalling. private java.util.TreeMap<String, Integer> _typeIdMap; private int _typeIdIndex; - }; + } private static final class EncapsEncoder10 extends EncapsEncoder { @@ -4338,7 +4339,7 @@ public class BasicStream // Encapsulation attributes for object marshalling. private int _objectIdIndex; private java.util.IdentityHashMap<Ice.Object, Integer> _toBeMarshaledMap; - }; + } private static final class EncapsEncoder11 extends EncapsEncoder { @@ -4667,11 +4668,12 @@ public class BasicStream final InstanceData previous; InstanceData next; - }; + } + private InstanceData _current; private int _objectIdIndex; // The ID of the next object to marhsal - }; + } private static final class ReadEncaps { @@ -4769,7 +4771,7 @@ public class BasicStream else { _readEncapsStack.decoder = new EncapsDecoder11(this, _sliceObjects, factoryManager); - }; + } } } diff --git a/java/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java b/java/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java index 35f750665c5..4bffef02b63 100644 --- a/java/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/CollocatedRequestHandler.java @@ -36,7 +36,7 @@ public class CollocatedRequestHandler implements RequestHandler, ResponseHandler private final int _requestId; private final int _invokeNum; private final boolean _batch; - }; + } public CollocatedRequestHandler(Reference ref, Ice.ObjectAdapter adapter) diff --git a/java/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java index 07d042a64e6..05a67290173 100644 --- a/java/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorFlushBatch.java @@ -10,11 +10,6 @@ package IceInternal; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; - -import Ice.CommunicatorDestroyedException; public class CommunicatorFlushBatch extends IceInternal.AsyncResultI { diff --git a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java index 76e7e2b7d6c..92dce6d5018 100644 --- a/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/CommunicatorObserverI.java @@ -168,7 +168,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb private final Ice.Instrumentation.ConnectionState _state; private String _id; private Ice.EndpointInfo _endpointInfo; - }; + } static public final class DispatchHelper extends MetricsHelper<DispatchMetrics> { @@ -313,7 +313,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb final private int _size; private String _id; private Ice.EndpointInfo _endpointInfo; - }; + } static public final class InvocationHelper extends MetricsHelper<InvocationMetrics> { @@ -471,7 +471,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb private String _id; static final private Ice.Endpoint[] emptyEndpoints = new Ice.Endpoint[0]; - }; + } static public final class ThreadHelper extends MetricsHelper<ThreadMetrics> { @@ -521,7 +521,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb final public String _parent; final public String _id; final private Ice.Instrumentation.ThreadState _state; - }; + } static public final class EndpointHelper extends MetricsHelper<Metrics> { @@ -590,7 +590,7 @@ public class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorOb final private Ice.Endpoint _endpoint; private String _id; private Ice.EndpointInfo _endpointInfo; - }; + } public CommunicatorObserverI(Ice.InitializationData initData) diff --git a/java/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java index c0a135123fa..098e8759d30 100644 --- a/java/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionACMMonitor.java @@ -123,4 +123,4 @@ class ConnectionACMMonitor implements ACMMonitor final private ACMConfig _config; private Ice.ConnectionI _connection; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java b/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java index b938201fde2..c932789606c 100644 --- a/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java +++ b/java/src/Ice/src/main/java/IceInternal/ConnectionFlushBatch.java @@ -10,11 +10,6 @@ package IceInternal; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; - -import Ice.CommunicatorDestroyedException; public class ConnectionFlushBatch extends OutgoingAsyncBase { diff --git a/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java index 0f9b6d18f00..2bb6327f388 100644 --- a/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java @@ -21,7 +21,7 @@ class FactoryACMMonitor implements ACMMonitor final Ice.ConnectionI connection; final boolean remove; - }; + } FactoryACMMonitor(Instance instance, ACMConfig config) { @@ -228,5 +228,5 @@ class FactoryACMMonitor implements ACMMonitor private java.util.List<Change> _changes = new java.util.ArrayList<Change>(); private java.util.List<Ice.ConnectionI> _reapedConnections = new java.util.ArrayList<Ice.ConnectionI>(); private java.util.concurrent.Future<?> _future; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java index 7c3d471c023..3be44cf2b6d 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1.java @@ -40,4 +40,4 @@ public abstract class Functional_TwowayCallbackArg1<T> extends Functional_Twoway } final private Functional_GenericCallback1<T> __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java index 30383c7b56a..3a48c6f8e48 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackArg1UE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackArg1UE<T> } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java index b2a3c2a4fd1..a902d1b1e59 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBool.java @@ -39,4 +39,4 @@ public abstract class Functional_TwowayCallbackBool extends Functional_TwowayCal } final private Functional_BoolCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java index 0c463cd6143..91d9c8d75a2 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackBoolUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackBoolUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java index cf08edcf445..64ae356976c 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByte.java @@ -39,4 +39,4 @@ public abstract class Functional_TwowayCallbackByte extends Functional_TwowayCal } final private Functional_ByteCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java index 974606311f5..38816c2d333 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackByteUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackByteUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java index b198b1439ca..32782b9783d 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDouble.java @@ -39,4 +39,4 @@ public abstract class Functional_TwowayCallbackDouble } final private Functional_DoubleCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java index 4ef97e8ad56..5328b4cb165 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackDoubleUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackDoubleUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java index 6f8b446ee1b..428a856a1ea 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloat.java @@ -40,4 +40,4 @@ public abstract class Functional_TwowayCallbackFloat } final private Functional_FloatCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java index 0b3d9fb6f4c..bba90be413b 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackFloatUE.java @@ -31,4 +31,4 @@ public abstract class Functional_TwowayCallbackFloatUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java index 82a051a8aa9..cf028e6e245 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackInt.java @@ -40,4 +40,4 @@ public abstract class Functional_TwowayCallbackInt } final private Functional_IntCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java index be7d88855a3..810cbacfa43 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackIntUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackIntUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java index ae9d08a2f24..f1fbdbea2ae 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLong.java @@ -40,4 +40,4 @@ public abstract class Functional_TwowayCallbackLong } final private Functional_LongCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java index d7db99cfc41..af3a28865cf 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackLongUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackLongUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java index 6a499cdcc0d..bb7ff8259a8 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShort.java @@ -40,4 +40,4 @@ public abstract class Functional_TwowayCallbackShort } final private Functional_ShortCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java index 7b896887d89..9ad288a06da 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackShortUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackShortUE } private final Functional_GenericCallback1<Ice.UserException> __userExceptionCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java index 537333a5808..436ef57b192 100644 --- a/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java +++ b/java/src/Ice/src/main/java/IceInternal/Functional_TwowayCallbackVoidUE.java @@ -32,4 +32,4 @@ public abstract class Functional_TwowayCallbackVoidUE } private final Functional_VoidCallback __responseCb; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/HttpParser.java b/java/src/Ice/src/main/java/IceInternal/HttpParser.java index c3532393cbd..26edc777eda 100644 --- a/java/src/Ice/src/main/java/IceInternal/HttpParser.java +++ b/java/src/Ice/src/main/java/IceInternal/HttpParser.java @@ -25,7 +25,7 @@ final class HttpParser Unknown, Request, Response - }; + } int isCompleteMessage(java.nio.ByteBuffer buf, int begin, int end) { @@ -714,6 +714,7 @@ final class HttpParser ResponseReason, ResponseLF, Complete - }; + } + private State _state; } diff --git a/java/src/Ice/src/main/java/IceInternal/IncomingAsync.java b/java/src/Ice/src/main/java/IceInternal/IncomingAsync.java index c8ea7cbf6e7..7783f6cac93 100644 --- a/java/src/Ice/src/main/java/IceInternal/IncomingAsync.java +++ b/java/src/Ice/src/main/java/IceInternal/IncomingAsync.java @@ -42,7 +42,7 @@ public class IncomingAsync extends IncomingBase implements Ice.AMDCallback { for(Ice.DispatchInterceptorAsyncCallback cb : _interceptorAsyncCallbackList) { - if(cb.exception(ex) == false) + if(!cb.exception(ex)) { return; } @@ -175,7 +175,7 @@ public class IncomingAsync extends IncomingBase implements Ice.AMDCallback { for(Ice.DispatchInterceptorAsyncCallback cb : _interceptorAsyncCallbackList) { - if(cb.response(ok) == false) + if(!cb.response(ok)) { return false; } diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index 0fa1a9d77bc..b76076e4499 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -9,7 +9,6 @@ package IceInternal; -import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; public final class Instance @@ -63,7 +62,7 @@ public final class Instance // private volatile Ice.Instrumentation.ThreadObserver _observer; private Ice.Instrumentation.ThreadObserver _threadObserver; - }; + } static private class Timer extends java.util.concurrent.ScheduledThreadPoolExecutor { @@ -97,7 +96,7 @@ public final class Instance } private final ThreadObserverHelper _observerHelper; - }; + } static private class QueueExecutor extends java.util.concurrent.ThreadPoolExecutor { @@ -137,7 +136,7 @@ public final class Instance } private final ThreadObserverHelper _observerHelper; - }; + } private class ObserverUpdaterI implements Ice.Instrumentation.ObserverUpdater { @@ -621,7 +620,7 @@ public final class Instance throw new Ice.CommunicatorDestroyedException(); } - Ice.Object result = null; + Ice.Object result; if(_adminAdapter == null || (!_adminFacetFilter.isEmpty() && !_adminFacetFilter.contains(facet))) { @@ -1397,7 +1396,7 @@ public final class Instance java.util.List<String> unusedProperties = ((Ice.PropertiesI)_initData.properties).getUnusedProperties(); if(unusedProperties.size() != 0) { - StringBuffer message = new StringBuffer("The following properties were set but never read:"); + StringBuilder message = new StringBuilder("The following properties were set but never read:"); for(String p : unusedProperties) { message.append("\n "); diff --git a/java/src/Ice/src/main/java/IceInternal/InvocationObserverI.java b/java/src/Ice/src/main/java/IceInternal/InvocationObserverI.java index bf96a9c0d0d..08d2c741ab7 100644 --- a/java/src/Ice/src/main/java/IceInternal/InvocationObserverI.java +++ b/java/src/Ice/src/main/java/IceInternal/InvocationObserverI.java @@ -113,7 +113,7 @@ public class InvocationObserverI final private int _size; private String _id; private Ice.EndpointInfo _endpointInfo; - }; + } static public final class CollocatedInvocationHelper extends MetricsHelper<CollocatedMetrics> { @@ -171,7 +171,7 @@ public class InvocationObserverI final private int _requestId; final private int _size; final private String _id; - }; + } @Override public void diff --git a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java index fe20942a315..210cc09002c 100644 --- a/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java +++ b/java/src/Ice/src/main/java/IceInternal/LocatorInfo.java @@ -86,7 +86,7 @@ public final class LocatorInfo final Reference _ref; final int _ttl; final GetEndpointsCallback _callback; - }; + } private abstract class Request { @@ -164,7 +164,7 @@ public final class LocatorInfo private boolean _response; private Ice.ObjectPrx _proxy; private Exception _exception; - }; + } private class ObjectRequest extends Request { @@ -211,7 +211,7 @@ public final class LocatorInfo exception(ex); } } - }; + } private class AdapterRequest extends Request { @@ -258,7 +258,7 @@ public final class LocatorInfo exception(ex); } } - }; + } LocatorInfo(Ice.LocatorPrx locator, LocatorTable table, boolean background) { diff --git a/java/src/Ice/src/main/java/IceInternal/MetricsAdminI.java b/java/src/Ice/src/main/java/IceInternal/MetricsAdminI.java index 8f8eec0667f..3890f8749a1 100644 --- a/java/src/Ice/src/main/java/IceInternal/MetricsAdminI.java +++ b/java/src/Ice/src/main/java/IceInternal/MetricsAdminI.java @@ -89,7 +89,7 @@ public class MetricsAdminI extends IceMX._MetricsAdminDisp implements Ice.Proper final private Class<T> _class; final private java.util.Map<String, MetricsMap.SubMapFactory<?>> _subMaps = new java.util.HashMap<String, MetricsMap.SubMapFactory<?>>(); - }; + } public MetricsAdminI(Ice.Properties properties, Ice.Logger logger) { diff --git a/java/src/Ice/src/main/java/IceInternal/MetricsMap.java b/java/src/Ice/src/main/java/IceInternal/MetricsMap.java index c69af08cce2..10a04c4b2bd 100644 --- a/java/src/Ice/src/main/java/IceInternal/MetricsMap.java +++ b/java/src/Ice/src/main/java/IceInternal/MetricsMap.java @@ -132,7 +132,7 @@ public class MetricsMap<T extends IceMX.Metrics> private T _object; private java.util.Map<String, Integer> _failures; private java.util.Map<String, SubMap<?>> _subMaps; - }; + } static class SubMap<S extends IceMX.Metrics> { @@ -164,7 +164,7 @@ public class MetricsMap<T extends IceMX.Metrics> final private MetricsMap<S> _map; final private java.lang.reflect.Field _field; - }; + } static class SubMapCloneFactory<S extends IceMX.Metrics> { @@ -182,7 +182,7 @@ public class MetricsMap<T extends IceMX.Metrics> final private MetricsMap<S> _map; final private java.lang.reflect.Field _field; - }; + } static class SubMapFactory<S extends IceMX.Metrics> { @@ -200,7 +200,7 @@ public class MetricsMap<T extends IceMX.Metrics> final private Class<S> _class; final private java.lang.reflect.Field _field; - }; + } MetricsMap(String mapPrefix, Class<T> cl, Ice.Properties props, java.util.Map<String, SubMapFactory<?>> subMaps) { @@ -514,4 +514,4 @@ public class MetricsMap<T extends IceMX.Metrics> final private java.util.Map<String, Entry> _objects = new java.util.HashMap<String, Entry>(); final private java.util.Map<String, SubMapCloneFactory<?>> _subMaps; private java.util.Deque<Entry> _detachedQueue; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/MetricsViewI.java b/java/src/Ice/src/main/java/IceInternal/MetricsViewI.java index 2f535e234f3..ceb3f47675b 100644 --- a/java/src/Ice/src/main/java/IceInternal/MetricsViewI.java +++ b/java/src/Ice/src/main/java/IceInternal/MetricsViewI.java @@ -123,4 +123,4 @@ public class MetricsViewI final private String _name; final private java.util.Map<String, MetricsMap<?>> _maps = new java.util.HashMap<String, MetricsMap<?>>(); -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/QueueExecutorService.java b/java/src/Ice/src/main/java/IceInternal/QueueExecutorService.java index 3a35a8d9878..75bb351c0bd 100644 --- a/java/src/Ice/src/main/java/IceInternal/QueueExecutorService.java +++ b/java/src/Ice/src/main/java/IceInternal/QueueExecutorService.java @@ -115,4 +115,4 @@ final class QueueExecutorService final ExecutorService _executor; final Thread _thread; -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java b/java/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java index 958fba4236c..012cd8d725a 100644 --- a/java/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/QueueRequestHandler.java @@ -10,12 +10,7 @@ package IceInternal; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; -import Ice.CommunicatorDestroyedException; import Ice.ConnectionI; public class QueueRequestHandler implements RequestHandler diff --git a/java/src/Ice/src/main/java/IceInternal/ResponseHandler.java b/java/src/Ice/src/main/java/IceInternal/ResponseHandler.java index 88f3678b5b2..89449a61945 100644 --- a/java/src/Ice/src/main/java/IceInternal/ResponseHandler.java +++ b/java/src/Ice/src/main/java/IceInternal/ResponseHandler.java @@ -15,4 +15,4 @@ public interface ResponseHandler void sendNoResponse(); boolean systemException(int requestId, Ice.SystemException ex); void invokeException(int requestId, Ice.LocalException ex, int invokeNum); -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/TwowayCallback.java b/java/src/Ice/src/main/java/IceInternal/TwowayCallback.java index 55c9044e6d6..14e2b28ecf7 100644 --- a/java/src/Ice/src/main/java/IceInternal/TwowayCallback.java +++ b/java/src/Ice/src/main/java/IceInternal/TwowayCallback.java @@ -32,4 +32,4 @@ public abstract class TwowayCallback extends CallbackBase implements Ice.TwowayC { return true; } -}; +} diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java index e0690efacd9..e2997e617ea 100644 --- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java @@ -279,7 +279,7 @@ final class UdpTransceiver implements Transceiver @Override public String toDetailedString() { - StringBuffer s = new StringBuffer(toString()); + StringBuilder s = new StringBuilder(toString()); java.util.List<String> intfs = Network.getHostsForEndpointExpand(_addr.getAddress().getHostAddress(), _instance.protocolSupport(), true); if(!intfs.isEmpty()) @@ -498,14 +498,13 @@ final class UdpTransceiver implements Transceiver // // Join multicast group. // - boolean join = false; if(intf != null) { _fd.join(group.getAddress(), intf); - join = true; } else { + boolean join = false; // // If the user doesn't specify an interface, we join to the multicast group with every // interface that supports multicast and has a configured address with the same protocol diff --git a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java index 7300aefe1bd..0a94fb7e92b 100644 --- a/java/src/Ice/src/main/java/IceMX/MetricsHelper.java +++ b/java/src/Ice/src/main/java/IceMX/MetricsHelper.java @@ -133,7 +133,7 @@ public class MetricsHelper<T> } private java.util.Map<String, Resolver> _attributes = new java.util.HashMap<String, Resolver>(); - }; + } protected MetricsHelper(AttributeResolver attributes) @@ -160,4 +160,4 @@ public class MetricsHelper<T> } private AttributeResolver _attributes; -};
\ No newline at end of file +}
\ No newline at end of file diff --git a/java/src/Ice/src/main/java/IceMX/Observer.java b/java/src/Ice/src/main/java/IceMX/Observer.java index 1ca0d9aba76..5727b52af58 100644 --- a/java/src/Ice/src/main/java/IceMX/Observer.java +++ b/java/src/Ice/src/main/java/IceMX/Observer.java @@ -16,7 +16,7 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple public interface MetricsUpdate<T> { void update(T m); - }; + } @Override public void @@ -133,4 +133,4 @@ public class Observer<T extends Metrics> extends IceUtilInternal.StopWatch imple private java.util.List<MetricsMap<T>.Entry> _objects; private long _previousDelay = 0; -}; +} diff --git a/java/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java b/java/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java index ed19cb6456b..f33aadd95ca 100644 --- a/java/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverFactoryWithDelegate.java @@ -45,4 +45,4 @@ public class ObserverFactoryWithDelegate<T extends Metrics, } return delegate; } -}; +} diff --git a/java/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java index 31341a5af71..6a74bcec765 100644 --- a/java/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegate.java @@ -71,4 +71,4 @@ public class ObserverWithDelegate<T extends Metrics, O extends Ice.Instrumentati } protected O _delegate; -}; +} diff --git a/java/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java index 00d928ffcf8..22a22590dda 100644 --- a/java/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java +++ b/java/src/Ice/src/main/java/IceMX/ObserverWithDelegateI.java @@ -11,4 +11,4 @@ package IceMX; public class ObserverWithDelegateI extends ObserverWithDelegate<Metrics, Ice.Instrumentation.Observer> { -}; +} diff --git a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java index 7799dcf2caa..ece36fe10e5 100644 --- a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java @@ -295,7 +295,7 @@ final class TransceiverI implements IceInternal.Transceiver info.nativeCerts = session.getPeerCertificates(); for(java.security.cert.Certificate c : info.nativeCerts) { - StringBuffer s = new StringBuffer("-----BEGIN CERTIFICATE-----\n"); + StringBuilder s = new StringBuilder("-----BEGIN CERTIFICATE-----\n"); s.append(IceUtilInternal.Base64.encode(c.getEncoded())); s.append("\n-----END CERTIFICATE-----"); certs.add(s.toString()); @@ -447,7 +447,6 @@ final class TransceiverI implements IceInternal.Transceiver // // Encrypt the buffer. // - int position = _netOutput.position(); SSLEngineResult result = _engine.wrap(buf, _netOutput); switch(result.getStatus()) { diff --git a/java/src/Ice/src/main/java/IceUtilInternal/StopWatch.java b/java/src/Ice/src/main/java/IceUtilInternal/StopWatch.java index 8231e852fbc..f41bd4a3272 100644 --- a/java/src/Ice/src/main/java/IceUtilInternal/StopWatch.java +++ b/java/src/Ice/src/main/java/IceUtilInternal/StopWatch.java @@ -39,4 +39,4 @@ public class StopWatch } private long _s = 0; -}; +} |