diff options
author | Jose <jose@zeroc.com> | 2014-06-11 18:11:59 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-06-11 18:11:59 +0200 |
commit | 2581263f816e4ebcb9cf5e5993eafbebdd0bc619 (patch) | |
tree | 4b0bbaf6c93378b0ff375c4dd43611bb0d1f2011 /java/src/IceSSL/Instance.java | |
parent | update dependencies (diff) | |
download | ice-2581263f816e4ebcb9cf5e5993eafbebdd0bc619.tar.bz2 ice-2581263f816e4ebcb9cf5e5993eafbebdd0bc619.tar.xz ice-2581263f816e4ebcb9cf5e5993eafbebdd0bc619.zip |
CR-20 - SecureTransport review fixes
Diffstat (limited to 'java/src/IceSSL/Instance.java')
-rw-r--r-- | java/src/IceSSL/Instance.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java index 944d6d95074..aa38aad03b8 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/IceSSL/Instance.java @@ -15,52 +15,52 @@ import java.util.List; class Instance extends IceInternal.ProtocolInstance { - Instance(SharedInstance sharedInstance, short type, String protocol) + Instance(SSLEngine engine, short type, String protocol) { - super(sharedInstance.communicator(), type, protocol); - _sharedInstance = sharedInstance; + super(engine.communicator(), type, protocol); + _engine = engine; } - SharedInstance sharedInstance() + SSLEngine engine() { - return _sharedInstance; + return _engine; } int securityTraceLevel() { - return _sharedInstance.securityTraceLevel(); + return _engine.securityTraceLevel(); } String securityTraceCategory() { - return _sharedInstance.securityTraceCategory(); + return _engine.securityTraceCategory(); } boolean initialized() { - return _sharedInstance.initialized(); + return _engine.initialized(); } javax.net.ssl.SSLEngine createSSLEngine(boolean incoming, java.net.InetSocketAddress peerAddr) { - return _sharedInstance.createSSLEngine(incoming, peerAddr); + return _engine.createSSLEngine(incoming, peerAddr); } void traceConnection(java.nio.channels.SocketChannel fd, javax.net.ssl.SSLEngine engine, boolean incoming) { - _sharedInstance.traceConnection(fd, engine, incoming); + _engine.traceConnection(fd, engine, incoming); } void verifyPeer(NativeConnectionInfo info, java.nio.channels.SelectableChannel fd, String address) { - _sharedInstance.verifyPeer(info, fd, address); + _engine.verifyPeer(info, fd, address); } void trustManagerFailure(boolean incoming, java.security.cert.CertificateException ex) throws java.security.cert.CertificateException { - _sharedInstance.trustManagerFailure(incoming, ex); + _engine.trustManagerFailure(incoming, ex); } - private SharedInstance _sharedInstance; + private SSLEngine _engine; } |