diff options
29 files changed, 115 insertions, 299 deletions
diff --git a/.gitignore b/.gitignore index 65cee480c20..4d3ed2ac4cc 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ obj *.RES ClientBin vcproj +# VIM swap file +*.swp diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index dabf7d751be..eaa4b39281d 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -1630,7 +1630,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne { throw new ConnectionNotValidatedException(); } - byte compress = is.readByte(); // Ignore compression status for validate connection. + is.readByte(); // Ignore compression status for validate connection. int size = is.readInt(); if(size != IceInternal.Protocol.headerSize) { @@ -2098,17 +2098,6 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne _logger.warning(s); } - private void - error(String msg, Exception ex) - { - java.io.StringWriter sw = new java.io.StringWriter(); - java.io.PrintWriter pw = new java.io.PrintWriter(sw); - ex.printStackTrace(pw); - pw.flush(); - String s = msg + ":\n" + _desc + "\n" + sw.toString(); - _logger.error(s); - } - private IceInternal.Incoming getIncoming(ObjectAdapter adapter, boolean response, byte compress, int requestId) { diff --git a/java/src/Ice/ObjectImpl.java b/java/src/Ice/ObjectImpl.java index 4f3b2b12f0e..cf763576817 100644 --- a/java/src/Ice/ObjectImpl.java +++ b/java/src/Ice/ObjectImpl.java @@ -243,7 +243,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable { if(__rid) { - String myId = __is.readTypeId(); + __is.readTypeId(); } __is.startReadSlice(); @@ -272,7 +272,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable { if(__rid) { - String myId = __inS.readTypeId(); + __inS.readTypeId(); } __inS.startSlice(); diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java index b8530e60530..89f856be484 100644 --- a/java/src/Ice/PluginManagerI.java +++ b/java/src/Ice/PluginManagerI.java @@ -306,7 +306,7 @@ public final class PluginManagerI implements PluginManager PluginFactory pluginFactory = null; try { - Class c = Class.forName(className); + Class<?> c = Class.forName(className); java.lang.Object obj = c.newInstance(); try { diff --git a/java/src/Ice/SysLoggerI.java b/java/src/Ice/SysLoggerI.java index 07c23f5e96a..69281db127d 100644 --- a/java/src/Ice/SysLoggerI.java +++ b/java/src/Ice/SysLoggerI.java @@ -31,7 +31,7 @@ public final class SysLoggerI implements Logger _socket = new DatagramSocket(); _socket.connect(_host, _port); } - catch(java.io.IOException ex) + catch(IOException ex) { Ice.SocketException se = new Ice.SocketException(); se.initCause(ex); @@ -84,7 +84,7 @@ public final class SysLoggerI implements Logger DatagramPacket p = new DatagramPacket(buf, buf.length, _host, _port); _socket.send(p); } - catch(java.io.IOException ex) + catch(IOException ex) { Ice.SocketException se = new Ice.SocketException(); se.initCause(ex); diff --git a/java/src/IceBox/Server.java b/java/src/IceBox/Server.java index 997a7251e4b..6438692c86b 100644 --- a/java/src/IceBox/Server.java +++ b/java/src/IceBox/Server.java @@ -50,7 +50,7 @@ public final class Server extends Ice.Application } } - ServiceManagerI serviceManagerImpl = new ServiceManagerI(this, args); + ServiceManagerI serviceManagerImpl = new ServiceManagerI(communicator(), args); return serviceManagerImpl.run(); } } diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index 51ddb54e4e8..64356f521db 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -16,13 +16,12 @@ package IceBox; public class ServiceManagerI extends _ServiceManagerDisp { public - ServiceManagerI(Ice.Application server, String[] args) + ServiceManagerI(Ice.Communicator communicator, String[] args) { - _server = server; - _logger = _server.communicator().getLogger(); + _communicator = communicator; + _logger = _communicator.getLogger(); _argv = args; - _traceServiceObserver = - _server.communicator().getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver"); + _traceServiceObserver = _communicator.getProperties().getPropertyAsInt("IceBox.Trace.ServiceObserver"); } public java.util.Map @@ -67,7 +66,7 @@ public class ServiceManagerI extends _ServiceManagerDisp boolean started = false; try { - info.service.start(name, info.communicator == null ? _server.communicator() : info.communicator, + info.service.start(name, info.communicator == null ? _communicator : info.communicator, info.args); started = true; } @@ -81,7 +80,6 @@ public class ServiceManagerI extends _ServiceManagerDisp sw.toString()); } - java.util.Set<ServiceObserverPrx> observers = null; synchronized(this) { java.util.Iterator<ServiceInfo> p = _services.iterator(); @@ -203,7 +201,7 @@ public class ServiceManagerI extends _ServiceManagerDisp if(_traceServiceObserver >= 1) { _logger.trace("IceBox.ServiceObserver", - "Added service observer " + _server.communicator().proxyToString(observer)); + "Added service observer " + _communicator.proxyToString(observer)); } @@ -244,7 +242,7 @@ public class ServiceManagerI extends _ServiceManagerDisp public void shutdown(Ice.Current current) { - _server.communicator().shutdown(); + _communicator.shutdown(); } public int @@ -252,7 +250,7 @@ public class ServiceManagerI extends _ServiceManagerDisp { try { - Ice.Properties properties = _server.communicator().getProperties(); + Ice.Properties properties = _communicator.getProperties(); // // Create an object adapter. Services probably should NOT share @@ -262,7 +260,7 @@ public class ServiceManagerI extends _ServiceManagerDisp Ice.ObjectAdapter adapter = null; if(!properties.getProperty("IceBox.ServiceManager.Endpoints").equals("")) { - adapter = _server.communicator().createObjectAdapter("IceBox.ServiceManager"); + adapter = _communicator.createObjectAdapter("IceBox.ServiceManager"); Ice.Identity identity = new Ice.Identity(); identity.category = properties.getPropertyWithDefault("IceBox.InstanceName", "IceBox"); @@ -398,8 +396,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // reachable before sending a signal to shutdown the // IceBox. // - _server.shutdownOnInterrupt(); - + Ice.Application.shutdownOnInterrupt(); // // Register "this" as a facet to the Admin object and @@ -407,7 +404,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // try { - _server.communicator().addAdminFacet(this, "IceBox.ServiceManager"); + _communicator.addAdminFacet(this, "IceBox.ServiceManager"); // // Add a Properties facet for each service @@ -415,11 +412,11 @@ public class ServiceManagerI extends _ServiceManagerDisp for(ServiceInfo info: _services) { Ice.Communicator communicator = info.communicator != null ? info.communicator : _sharedCommunicator; - _server.communicator().addAdminFacet(new PropertiesAdminI(communicator.getProperties()), + _communicator.addAdminFacet(new PropertiesAdminI(communicator.getProperties()), "IceBox.Service." + info.name + ".Properties"); } - _server.communicator().getAdmin(); + _communicator.getAdmin(); } catch(Ice.ObjectAdapterDeactivatedException ex) { @@ -445,8 +442,8 @@ public class ServiceManagerI extends _ServiceManagerDisp } } - _server.communicator().waitForShutdown(); - _server.defaultInterrupt(); + _communicator.waitForShutdown(); + Ice.Application.defaultInterrupt(); // // Invoke stop() on the services. @@ -501,7 +498,7 @@ public class ServiceManagerI extends _ServiceManagerDisp info.args = args; try { - Class c = Class.forName(className); + Class<?> c = Class.forName(className); java.lang.Object obj = c.newInstance(); try { @@ -549,7 +546,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // commnunicator property set. // Ice.Communicator communicator; - if(_server.communicator().getProperties().getPropertyAsInt("IceBox.UseSharedCommunicator." + service) > 0) + if(_communicator.getProperties().getPropertyAsInt("IceBox.UseSharedCommunicator." + service) > 0) { assert(_sharedCommunicator != null); communicator = _sharedCommunicator; @@ -704,7 +701,7 @@ public class ServiceManagerI extends _ServiceManagerDisp try { - _server.communicator().removeAdminFacet("IceBox.Service." + info.name + ".Properties"); + _communicator.removeAdminFacet("IceBox.Service." + info.name + ".Properties"); } catch(Ice.LocalException e) { @@ -856,7 +853,7 @@ public class ServiceManagerI extends _ServiceManagerDisp if(!(ex instanceof Ice.CommunicatorDestroyedException)) { _logger.trace("IceBox.ServiceObserver", - "Removed service observer " + _server.communicator().proxyToString(observer) + "Removed service observer " + _communicator.proxyToString(observer) + "\nafter catching " + ex.toString()); } } @@ -943,7 +940,7 @@ public class ServiceManagerI extends _ServiceManagerDisp if(serverArgs.length > 0) { - java.util.List l = new java.util.ArrayList(java.util.Arrays.asList(args)); + java.util.List<String> l = new java.util.ArrayList<String>(java.util.Arrays.asList(args)); for(int j = 0; j < serverArgs.length; j++) { if(serverArgs[j].startsWith("--" + service + ".")) @@ -951,7 +948,7 @@ public class ServiceManagerI extends _ServiceManagerDisp l.add(serverArgs[j]); } } - args = (String[])l.toArray(args); + args = l.toArray(args); } } @@ -964,7 +961,7 @@ public class ServiceManagerI extends _ServiceManagerDisp createServiceProperties(String service) { Ice.Properties properties; - Ice.Properties communicatorProperties = _server.communicator().getProperties(); + Ice.Properties communicatorProperties = _communicator.getProperties(); if(communicatorProperties.getPropertyAsInt("IceBox.InheritProperties") > 0) { properties = communicatorProperties._clone(); @@ -987,7 +984,7 @@ public class ServiceManagerI extends _ServiceManagerDisp return properties; } - private Ice.Application _server; + private Ice.Communicator _communicator; private Ice.Communicator _sharedCommunicator; private Ice.Logger _logger; private String[] _argv; // Filtered server argument vector diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index 3b99fa17b69..9be9e9e533c 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -2149,7 +2149,7 @@ public class BasicStream private static final class DynamicObjectFactory implements Ice.ObjectFactory { - DynamicObjectFactory(Class c) + DynamicObjectFactory(Class<?> c) { _class = c; } @@ -2174,7 +2174,7 @@ public class BasicStream { } - private Class _class; + private Class<?> _class; } private Ice.ObjectFactory @@ -2184,7 +2184,7 @@ public class BasicStream try { - Class c = findClass(id); + Class<?> c = findClass(id); if(c != null) { Ice.ObjectFactory dynamicFactory = new DynamicObjectFactory(c); @@ -2229,7 +2229,7 @@ public class BasicStream private static final class DynamicUserExceptionFactory implements UserExceptionFactory { - DynamicUserExceptionFactory(Class c) + DynamicUserExceptionFactory(Class<?> c) { _class = c; } @@ -2259,7 +2259,7 @@ public class BasicStream { } - private Class _class; + private Class<?> _class; } private UserExceptionFactory @@ -2276,7 +2276,7 @@ public class BasicStream { try { - Class c = findClass(id); + Class<?> c = findClass(id); if(c != null) { factory = new DynamicUserExceptionFactory(c); @@ -2301,11 +2301,11 @@ public class BasicStream return factory; } - private Class + private Class<?> findClass(String id) throws LinkageError { - Class c = null; + Class<?> c = null; // // To convert a Slice type id into a Java class, we do the following: @@ -2345,13 +2345,13 @@ public class BasicStream return c; } - private Class + private Class<?> getConcreteClass(String className) throws LinkageError { try { - Class c = Class.forName(className); + Class<?> c = Class.forName(className); // // Ensure the class is instantiable. The constants are // defined in the JVM specification (0x200 = interface, @@ -2531,8 +2531,8 @@ public class BasicStream return _bzInputStreamCtor != null && _bzOutputStreamCtor != null; } - private static java.lang.reflect.Constructor _bzInputStreamCtor; - private static java.lang.reflect.Constructor _bzOutputStreamCtor; + private static java.lang.reflect.Constructor<?> _bzInputStreamCtor; + private static java.lang.reflect.Constructor<?> _bzOutputStreamCtor; static { try diff --git a/java/src/IceInternal/Connector.java b/java/src/IceInternal/Connector.java index 326c264d498..d8e94ecd803 100644 --- a/java/src/IceInternal/Connector.java +++ b/java/src/IceInternal/Connector.java @@ -20,5 +20,4 @@ public interface Connector // Compare connectors for sorting process. // boolean equals(java.lang.Object obj); - int compareTo(java.lang.Object obj); // From java.lang.Comparable. } diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java index 98a4c393bec..4e7c302b248 100644 --- a/java/src/IceInternal/EndpointFactoryManager.java +++ b/java/src/IceInternal/EndpointFactoryManager.java @@ -112,7 +112,7 @@ public final class EndpointFactoryManager ue.streamWrite(bs); Buffer buf = bs.getBuffer(); buf.b.position(0); - short type = bs.readShort(); + bs.readShort(); // type return f.read(bs); } } @@ -125,7 +125,6 @@ public final class EndpointFactoryManager public synchronized EndpointI read(BasicStream s) { - EndpointI v; short type = s.readShort(); for(int i = 0; i < _factories.size(); i++) diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java index 5e07fd43a78..9882cd1ec26 100644 --- a/java/src/IceInternal/IncomingAsync.java +++ b/java/src/IceInternal/IncomingAsync.java @@ -158,10 +158,10 @@ public class IncomingAsync extends IncomingBase { if(_interceptorAsyncCallbackList != null) { - java.util.Iterator p = _interceptorAsyncCallbackList.iterator(); + java.util.Iterator<Ice.DispatchInterceptorAsyncCallback> p = _interceptorAsyncCallbackList.iterator(); while(p.hasNext()) { - Ice.DispatchInterceptorAsyncCallback cb = (Ice.DispatchInterceptorAsyncCallback)p.next(); + Ice.DispatchInterceptorAsyncCallback cb = p.next(); if(cb.response(ok) == false) { return false; diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index bfcc28b62a1..83012ac9578 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -412,7 +412,6 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice _endpoint = _endpoint.compress(defaultsAndOverrides.overrideCompressValue); } - Ice.ObjectAdapterI adapterImpl = (Ice.ObjectAdapterI)_adapter; try { EndpointIHolder h = new EndpointIHolder(); @@ -588,17 +587,6 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice _instance.initializationData().logger.warning(s); } - private void - error(String msg, Exception ex) - { - java.io.StringWriter sw = new java.io.StringWriter(); - java.io.PrintWriter pw = new java.io.PrintWriter(sw); - ex.printStackTrace(pw); - pw.flush(); - String s = msg + ":\n" + toString() + "\n" + sw.toString(); - _instance.initializationData().logger.error(s); - } - private Acceptor _acceptor; private final Transceiver _transceiver; private EndpointI _endpoint; diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java index 278696d91dc..164f5e876f2 100644 --- a/java/src/IceInternal/Network.java +++ b/java/src/IceInternal/Network.java @@ -482,8 +482,7 @@ public final class Network { try { - java.nio.channels.SelectionKey key = - fd.register(selector, java.nio.channels.SelectionKey.OP_ACCEPT); + fd.register(selector, java.nio.channels.SelectionKey.OP_ACCEPT); int n; if(timeout > 0) { diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java index 45d3ea2c557..34eeabe325d 100644 --- a/java/src/IceInternal/ProxyFactory.java +++ b/java/src/IceInternal/ProxyFactory.java @@ -220,7 +220,7 @@ public final class ProxyFactory // try { - Thread.currentThread().sleep(interval); + Thread.sleep(interval); } catch(InterruptedException ex1) { diff --git a/java/src/IceInternal/RouterInfo.java b/java/src/IceInternal/RouterInfo.java index d7858a1dba9..404f7fa0568 100644 --- a/java/src/IceInternal/RouterInfo.java +++ b/java/src/IceInternal/RouterInfo.java @@ -93,7 +93,6 @@ public final class RouterInfo return; } - final RouterInfo self = this; _router.getClientProxy_async(new Ice.AMI_Router_getClientProxy() { public void diff --git a/java/src/IceInternal/Selector.java b/java/src/IceInternal/Selector.java index 49c7ce5c809..bbb642f09dd 100644 --- a/java/src/IceInternal/Selector.java +++ b/java/src/IceInternal/Selector.java @@ -302,7 +302,7 @@ public final class Selector // try { - Thread.currentThread().sleep(1); + Thread.sleep(1); } catch(java.lang.InterruptedException ex) { diff --git a/java/src/IceInternal/SequencePatcher.java b/java/src/IceInternal/SequencePatcher.java index 9b8b7b82407..94d907c982b 100644 --- a/java/src/IceInternal/SequencePatcher.java +++ b/java/src/IceInternal/SequencePatcher.java @@ -12,7 +12,7 @@ package IceInternal; public class SequencePatcher implements Patcher, Ice.ReadObjectCallback { public - SequencePatcher(java.lang.Object[] seq, Class cls, String type, int index) + SequencePatcher(java.lang.Object[] seq, Class<?> cls, String type, int index) { _seq = seq; _cls = cls; @@ -51,7 +51,7 @@ public class SequencePatcher implements Patcher, Ice.ReadObjectCallback } private java.lang.Object[] _seq; - private Class _cls; + private Class<?> _cls; private String _type; private int _index; } diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java index 2f6f8707b5f..03c93766063 100644 --- a/java/src/IceInternal/TcpAcceptor.java +++ b/java/src/IceInternal/TcpAcceptor.java @@ -130,5 +130,4 @@ class TcpAcceptor implements Acceptor private java.nio.channels.ServerSocketChannel _fd; private int _backlog; private java.net.InetSocketAddress _addr; - private java.nio.channels.Selector _selector; } diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java index 2f9d4f99a14..ae5d618be99 100644 --- a/java/src/IceInternal/TcpConnector.java +++ b/java/src/IceInternal/TcpConnector.java @@ -9,7 +9,7 @@ package IceInternal; -final class TcpConnector implements Connector, java.lang.Comparable +final class TcpConnector implements Connector { public Transceiver connect() @@ -83,18 +83,9 @@ final class TcpConnector implements Connector, java.lang.Comparable _hashCode = 5 * _hashCode + _connectionId.hashCode(); } - // - // Compare connectors for sorting purposes - // public boolean equals(java.lang.Object obj) { - return compareTo(obj) == 0; - } - - public int - compareTo(java.lang.Object obj) // From java.lang.Comparable - { TcpConnector p = null; try @@ -103,55 +94,27 @@ final class TcpConnector implements Connector, java.lang.Comparable } catch(ClassCastException ex) { - try - { - Connector c = (Connector)obj; - return type() < c.type() ? -1 : 1; - } - catch(ClassCastException ee) - { - assert(false); - } + return false; } if(this == p) { - return 0; + return true; } - if(_timeout < p._timeout) + if(_timeout != p._timeout) { - return -1; - } - else if(p._timeout < _timeout) - { - return 1; + return false; } if(!_connectionId.equals(p._connectionId)) { - return _connectionId.compareTo(p._connectionId); - } - - if(_timeout < p._timeout) - { - return -1; - } - else if(p._timeout < _timeout) - { - return 1; + return false; } - return Network.compareAddress(_addr, p._addr); + return Network.compareAddress(_addr, p._addr) == 0; } - protected synchronized void - finalize() - throws Throwable - { - super.finalize(); - } - private Instance _instance; private TraceLevels _traceLevels; private Ice.Logger _logger; diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java index b7e7ad81461..e45ef281f50 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/IceInternal/ThreadPool.java @@ -795,8 +795,8 @@ public final class ThreadPool throw e; } - byte messageType = stream.readByte(); - byte compress = stream.readByte(); + stream.readByte(); // messageType + stream.readByte(); // compress int size = stream.readInt(); if(size < Protocol.headerSize) { diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java index b76842d368e..87050899976 100644 --- a/java/src/IceInternal/Timer.java +++ b/java/src/IceInternal/Timer.java @@ -248,7 +248,7 @@ public final class Timer extends Thread } } - static private class Token implements Comparable + static private class Token implements Comparable<Token> { public Token(long scheduledTime, int id, long delay, TimerTask task) @@ -260,12 +260,11 @@ public final class Timer extends Thread } public int - compareTo(Object o) + compareTo(Token r) { // // Token are sorted by scheduled time and token id. // - Token r = (Token)o; if(scheduledTime < r.scheduledTime) { return -1; diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java index 39eaa1d3e92..13e447c9065 100644 --- a/java/src/IceInternal/TraceUtil.java +++ b/java/src/IceInternal/TraceUtil.java @@ -78,8 +78,6 @@ public final class TraceUtil public static void dumpStream(BasicStream stream) { - final int inc = 8; - int pos = stream.pos(); stream.pos(0); @@ -356,19 +354,22 @@ public final class TraceUtil private static byte printHeader(java.io.Writer out, BasicStream stream) { - byte magic; - magic = stream.readByte(); // Don't bother printing the magic number - magic = stream.readByte(); - magic = stream.readByte(); - magic = stream.readByte(); + stream.readByte(); // Don't bother printing the magic number + stream.readByte(); + stream.readByte(); + stream.readByte(); - byte pMajor = stream.readByte(); - byte pMinor = stream.readByte(); -// out.write("\nprotocol version = " + (int)pMajor + "." + (int)pMinor); +// byte pMajor = stream.readByte(); +// byte pMinor = stream.readByte(); +// out.write("\nprotocol version = " + (int)pMajor + "." + (int)pMinor); + stream.readByte(); // major + stream.readByte(); // minor - byte eMajor = stream.readByte(); - byte eMinor = stream.readByte(); -// out.write("\nencoding version = " + (int)eMajor + "." + (int)eMinor); +// byte eMajor = stream.readByte(); +// byte eMinor = stream.readByte(); +// out.write("\nencoding version = " + (int)eMajor + "." + (int)eMinor); + stream.readByte(); // major + stream.readByte(); // minor byte type = stream.readByte(); diff --git a/java/src/IceInternal/UdpConnector.java b/java/src/IceInternal/UdpConnector.java index 3ad920f5e87..5ef3ada65bc 100644 --- a/java/src/IceInternal/UdpConnector.java +++ b/java/src/IceInternal/UdpConnector.java @@ -9,7 +9,7 @@ package IceInternal; -final class UdpConnector implements Connector, java.lang.Comparable +final class UdpConnector implements Connector { public Transceiver connect() @@ -49,8 +49,6 @@ final class UdpConnector implements Connector, java.lang.Comparable byte protocolMajor, byte protocolMinor, byte encodingMajor, byte encodingMinor, String connectionId) { _instance = instance; - _traceLevels = instance.traceLevels(); - _logger = instance.initializationData().logger; _addr = addr; _mcastInterface = mcastInterface; _mcastTtl = mcastTtl; @@ -67,18 +65,9 @@ final class UdpConnector implements Connector, java.lang.Comparable _hashCode = 5 * _hashCode + _connectionId.hashCode(); } - // - // Compare connectors for sorting purposes - // public boolean equals(java.lang.Object obj) { - return compareTo(obj) == 0; - } - - public int - compareTo(java.lang.Object obj) // From java.lang.Comparable - { UdpConnector p = null; try @@ -87,84 +76,53 @@ final class UdpConnector implements Connector, java.lang.Comparable } catch(ClassCastException ex) { - try - { - Connector c = (Connector)obj; - return type() < c.type() ? -1 : 1; - } - catch(ClassCastException ee) - { - assert(false); - } + return false; } if(this == p) { - return 0; + return false; } if(!_connectionId.equals(p._connectionId)) { - return _connectionId.compareTo(p._connectionId); + return false; } - if(_protocolMajor < p._protocolMajor) - { - return -1; - } - else if(p._protocolMajor < _protocolMajor) + if(_protocolMajor != p._protocolMajor) { - return 1; + return false; } - if(_protocolMinor < p._protocolMinor) + if(_protocolMinor != p._protocolMinor) { - return -1; - } - else if(p._protocolMinor < _protocolMinor) - { - return 1; + return false; } - if(_encodingMajor < p._encodingMajor) - { - return -1; - } - else if(p._encodingMajor < _encodingMajor) + if(_encodingMajor != p._encodingMajor) { - return 1; + return false; } - if(_encodingMinor < p._encodingMinor) + if(_encodingMinor != p._encodingMinor) { - return -1; - } - else if(p._encodingMinor < _encodingMinor) - { - return 1; + return false; } - if(_mcastTtl < p._mcastTtl) - { - return -1; - } - else if(p._mcastTtl < _mcastTtl) + if(_mcastTtl != p._mcastTtl) { - return 1; + return false; } - int rc = _mcastInterface.compareTo(p._mcastInterface); - if(rc != 0) + if(_mcastInterface.compareTo(p._mcastInterface) != 0) { - return rc; + return false; } - return Network.compareAddress(_addr, p._addr); + return Network.compareAddress(_addr, p._addr) == 0; } private Instance _instance; - private TraceLevels _traceLevels; - private Ice.Logger _logger; private java.net.InetSocketAddress _addr; private String _mcastInterface; private int _mcastTtl; diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 52000361be0..6f999903869 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -264,7 +264,6 @@ final class UdpTransceiver implements Transceiver _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; _stats = instance.initializationData().stats; - _incoming = false; _connect = true; _warn = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0; _addr = addr; @@ -302,7 +301,6 @@ final class UdpTransceiver implements Transceiver _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; _stats = instance.initializationData().stats; - _incoming = true; _connect = connect; _warn = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0; @@ -438,8 +436,8 @@ final class UdpTransceiver implements Transceiver { try { - java.lang.reflect.Constructor c = - Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredConstructor((Class[])null); + java.lang.reflect.Constructor<?> c = + Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredConstructor((Class<?>[])null); c.setAccessible(true); java.net.DatagramSocketImpl socketImpl = (java.net.DatagramSocketImpl)c.newInstance((Object[])null); @@ -448,7 +446,7 @@ final class UdpTransceiver implements Transceiver // that this hack works properly when IPv6 is enabled on Windows. // java.lang.reflect.Method m = - Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredMethod("create", (Class[])null); + Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredMethod("create", (Class<?>[])null); m.setAccessible(true); m.invoke(socketImpl); @@ -475,7 +473,7 @@ final class UdpTransceiver implements Transceiver if(group != null) { - Class[] types = new Class[]{ java.net.SocketAddress.class, java.net.NetworkInterface.class }; + Class<?>[] types = new Class<?>[]{ java.net.SocketAddress.class, java.net.NetworkInterface.class }; m = socketImpl.getClass().getDeclaredMethod("joinGroup", types); m.setAccessible(true); Object[] args = new Object[]{ group, intf }; @@ -483,7 +481,7 @@ final class UdpTransceiver implements Transceiver } else if(intf != null) { - Class[] types = new Class[]{ Integer.TYPE, Object.class }; + Class<?>[] types = new Class<?>[]{ Integer.TYPE, Object.class }; m = socketImpl.getClass().getDeclaredMethod("setOption", types); m.setAccessible(true); Object[] args = new Object[]{ new Integer(java.net.SocketOptions.IP_MULTICAST_IF2), intf }; @@ -492,7 +490,7 @@ final class UdpTransceiver implements Transceiver if(ttl != -1) { - Class[] types = new Class[]{ Integer.TYPE }; + Class<?>[] types = new Class<?>[]{ Integer.TYPE }; m = java.net.DatagramSocketImpl.class.getDeclaredMethod("setTimeToLive", types); m.setAccessible(true); Object[] args = new Object[]{ new Integer(ttl) }; @@ -512,11 +510,6 @@ final class UdpTransceiver implements Transceiver } } - private void - closeSocket() - { - } - protected synchronized void finalize() throws Throwable @@ -529,7 +522,6 @@ final class UdpTransceiver implements Transceiver private TraceLevels _traceLevels; private Ice.Logger _logger; private Ice.Stats _stats; - private boolean _incoming; private boolean _connect; private final boolean _warn; private int _rcvSize; diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java index 2cad6527af7..e9d5fc76d44 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/IceInternal/ValueWriter.java @@ -130,7 +130,7 @@ public final class ValueWriter { break; } - java.lang.reflect.Method valueMethod = c.getDeclaredMethod("value", new Class[0]); + java.lang.reflect.Method valueMethod = c.getDeclaredMethod("value", new Class<?>[0]); if(!valueMethod.getReturnType().equals(Integer.TYPE) || !java.lang.reflect.Modifier.isPublic(valueMethod.getModifiers()) || java.lang.reflect.Modifier.isStatic(valueMethod.getModifiers())) @@ -179,7 +179,7 @@ public final class ValueWriter } private static void - writeFields(String name, java.lang.Object obj, Class c, + writeFields(String name, java.lang.Object obj, Class<?> c, java.util.Map<java.lang.Object, java.lang.Object> objectTable, IceUtilInternal.OutputBase out) { if(!c.equals(java.lang.Object.class)) diff --git a/java/src/IceSSL/ConnectorI.java b/java/src/IceSSL/ConnectorI.java index 0da713515fd..7210f286fe8 100644 --- a/java/src/IceSSL/ConnectorI.java +++ b/java/src/IceSSL/ConnectorI.java @@ -9,7 +9,7 @@ package IceSSL; -final class ConnectorI implements IceInternal.Connector, java.lang.Comparable +final class ConnectorI implements IceInternal.Connector { public IceInternal.Transceiver connect() @@ -94,18 +94,9 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable _hashCode = 5 * _hashCode + _connectionId.hashCode(); } - // - // Compare connectors for sorting purposes - // public boolean equals(java.lang.Object obj) { - return compareTo(obj) == 0; - } - - public int - compareTo(java.lang.Object obj) // From java.lang.Comparable - { ConnectorI p = null; try @@ -114,53 +105,25 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable } catch(ClassCastException ex) { - try - { - IceInternal.Connector c = (IceInternal.Connector)obj; - return type() < c.type() ? -1 : 1; - } - catch(ClassCastException ee) - { - assert(false); - } + return false; } if(this == p) { - return 0; + return false; } - if(_timeout < p._timeout) + if(_timeout != p._timeout) { - return -1; - } - else if(p._timeout < _timeout) - { - return 1; + return false; } if(!_connectionId.equals(p._connectionId)) { - return _connectionId.compareTo(p._connectionId); - } - - if(_timeout < p._timeout) - { - return -1; - } - else if(p._timeout < _timeout) - { - return 1; + return false; } - return IceInternal.Network.compareAddress(_addr, p._addr); - } - - protected synchronized void - finalize() - throws Throwable - { - super.finalize(); + return IceInternal.Network.compareAddress(_addr, p._addr) == 0; } private Instance _instance; diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java index 3fdaaa862f2..efa1256ad48 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/IceSSL/Instance.java @@ -13,8 +13,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import Ice.Logger; - class Instance { Instance(Ice.Communicator communicator) @@ -108,7 +106,7 @@ class Instance throw e; } - Class cls = null; + Class<?> cls = null; try { cls = Class.forName(certVerifierClass); @@ -147,7 +145,7 @@ class Instance throw e; } - Class cls = null; + Class<?> cls = null; try { cls = Class.forName(passwordCallbackClass); diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java index 4a90b8c05df..2970025b02e 100644 --- a/java/src/IceSSL/TransceiverI.java +++ b/java/src/IceSSL/TransceiverI.java @@ -515,11 +515,6 @@ final class TransceiverI implements IceInternal.Transceiver } } - private void - shutdown() - { - } - private IceInternal.SocketStatus writeNonBlocking(ByteBuffer buf) { diff --git a/java/test/Ice/background/Connector.java b/java/test/Ice/background/Connector.java index 242d45ea7e4..4a386fb3e0c 100644 --- a/java/test/Ice/background/Connector.java +++ b/java/test/Ice/background/Connector.java @@ -7,7 +7,7 @@ // // ********************************************************************** -final class Connector implements IceInternal.Connector, java.lang.Comparable +final class Connector implements IceInternal.Connector { public IceInternal.Transceiver connect() @@ -43,18 +43,9 @@ final class Connector implements IceInternal.Connector, java.lang.Comparable _connector = connector; } - // - // Compare connectors for sorting purposes - // public boolean equals(java.lang.Object obj) { - return compareTo(obj) == 0; - } - - public int - compareTo(java.lang.Object obj) // From java.lang.Comparable - { Connector p = null; try @@ -63,32 +54,17 @@ final class Connector implements IceInternal.Connector, java.lang.Comparable } catch(ClassCastException ex) { - try - { - IceInternal.Connector c = (IceInternal.Connector)obj; - return type() < c.type() ? -1 : 1; - } - catch(ClassCastException ee) - { - assert(false); - } + return false; } if(this == p) { - return 0; + return false; } - return _connector.compareTo(p._connector); + return _connector.equals(p._connector); } - protected synchronized void - finalize() - throws Throwable - { - super.finalize(); - } - final private IceInternal.Connector _connector; final private Configuration _configuration; } |