CR-20 - SecureTransport review fixes

5 files changed, 34 insertions, 34 deletions

diff --git a/java/src/IceSSL/EndpointFactoryI.java b/java/src/IceSSL/EndpointFactoryI.java
index e566049db7d..74f04426d60 100644
--- a/java/src/IceSSL/EndpointFactoryI.java
+++ b/java/src/IceSSL/EndpointFactoryI.java
@@ -45,7 +45,7 @@ final class EndpointFactoryI implements IceInternal.EndpointFactory
 
     public IceInternal.EndpointFactory clone(IceInternal.ProtocolInstance instance)
     {
-        return new EndpointFactoryI(new Instance(_instance.sharedInstance(), instance.type(), instance.protocol()));
+        return new EndpointFactoryI(new Instance(_instance.engine(), instance.type(), instance.protocol()));
     }
 
     private Instance _instance;
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;
 }
diff --git a/java/src/IceSSL/PluginI.java b/java/src/IceSSL/PluginI.java
index ba714104582..fbd2123c0c6 100644
--- a/java/src/IceSSL/PluginI.java
+++ b/java/src/IceSSL/PluginI.java
@@ -15,7 +15,7 @@ class PluginI implements Plugin
     {
         IceInternal.ProtocolPluginFacade facade = IceInternal.Util.getProtocolPluginFacade(communicator);
 
-        _sharedInstance = new SharedInstance(facade);
+        _engine = new SSLEngine(facade);
 
         //
         // Register the endpoint factory. We have to do this now, rather than
@@ -23,12 +23,12 @@ class PluginI implements Plugin
         // proxies before the plug-in is fully initialized.
         //
         facade.addEndpointFactory(
-            new EndpointFactoryI(new Instance(_sharedInstance, IceSSL.EndpointType.value, "ssl")));
+            new EndpointFactoryI(new Instance(_engine, IceSSL.EndpointType.value, "ssl")));
     }
 
     public void initialize()
     {
-        _sharedInstance.initialize();
+        _engine.initialize();
     }
 
     public void destroy()
@@ -37,48 +37,48 @@ class PluginI implements Plugin
 
     public void setContext(javax.net.ssl.SSLContext context)
     {
-        _sharedInstance.context(context);
+        _engine.context(context);
     }
 
     public javax.net.ssl.SSLContext getContext()
     {
-        return _sharedInstance.context();
+        return _engine.context();
     }
 
     public void setCertificateVerifier(CertificateVerifier verifier)
     {
-        _sharedInstance.setCertificateVerifier(verifier);
+        _engine.setCertificateVerifier(verifier);
     }
 
     public CertificateVerifier getCertificateVerifier()
     {
-        return _sharedInstance.getCertificateVerifier();
+        return _engine.getCertificateVerifier();
     }
 
     public void setPasswordCallback(PasswordCallback callback)
     {
-        _sharedInstance.setPasswordCallback(callback);
+        _engine.setPasswordCallback(callback);
     }
 
     public PasswordCallback getPasswordCallback()
     {
-        return _sharedInstance.getPasswordCallback();
+        return _engine.getPasswordCallback();
     }
 
     public void setKeystoreStream(java.io.InputStream stream)
     {
-        _sharedInstance.setKeystoreStream(stream);
+        _engine.setKeystoreStream(stream);
     }
 
     public void setTruststoreStream(java.io.InputStream stream)
     {
-        _sharedInstance.setTruststoreStream(stream);
+        _engine.setTruststoreStream(stream);
     }
 
     public void addSeedStream(java.io.InputStream stream)
     {
-        _sharedInstance.addSeedStream(stream);
+        _engine.addSeedStream(stream);
     }
 
-    private SharedInstance _sharedInstance;
+    private SSLEngine _engine;
 }
diff --git a/java/src/IceSSL/SharedInstance.java b/java/src/IceSSL/SSLEngine.java
index 842dfe4b157..d8e4361e344 100644
--- a/java/src/IceSSL/SharedInstance.java
+++ b/java/src/IceSSL/SSLEngine.java
@@ -13,9 +13,9 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-class SharedInstance
+class SSLEngine
 {
-    SharedInstance(IceInternal.ProtocolPluginFacade facade)
+    SSLEngine(IceInternal.ProtocolPluginFacade facade)
     {
         _communicator = facade.getCommunicator();
         _logger = _communicator.getLogger();
diff --git a/java/src/IceSSL/X509TrustManagerI.java b/java/src/IceSSL/X509TrustManagerI.java
index 9a1f22cb470..ab1bc5a6b6b 100644
--- a/java/src/IceSSL/X509TrustManagerI.java
+++ b/java/src/IceSSL/X509TrustManagerI.java
@@ -11,9 +11,9 @@ package IceSSL;
 
 final class X509TrustManagerI implements javax.net.ssl.X509TrustManager
 {
-    X509TrustManagerI(SharedInstance instance, javax.net.ssl.X509TrustManager delegate)
+    X509TrustManagerI(SSLEngine engine, javax.net.ssl.X509TrustManager delegate)
     {
-        _instance = instance;
+        _engine = engine;
         _delegate = delegate;
     }
 
@@ -34,7 +34,7 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager
             }
             catch(java.security.cert.CertificateException ex)
             {
-                _instance.trustManagerFailure(true, ex);
+                _engine.trustManagerFailure(true, ex);
             }
         }
     }
@@ -56,7 +56,7 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager
             }
             catch(java.security.cert.CertificateException ex)
             {
-                _instance.trustManagerFailure(false, ex);
+                _engine.trustManagerFailure(false, ex);
             }
         }
     }
@@ -67,6 +67,6 @@ final class X509TrustManagerI implements javax.net.ssl.X509TrustManager
         return _delegate.getAcceptedIssuers();
     }
 
-    private SharedInstance _instance;
+    private SSLEngine _engine;
     private javax.net.ssl.X509TrustManager _delegate;
 }