Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax...

Bug: 2672817
Change-Id: Iadf21b848eaf8850fce22721b9ba3739ab2e9fca

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
index aab101d..020a909 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
@@ -76,9 +76,9 @@ public abstract class HandshakeProtocol {
     protected SSLRecordProtocol recordProtocol;
 
     /**
-     * SSLParameters suplied by SSLSocket or SSLEngine
+     * SSLParametersImpl suplied by SSLSocket or SSLEngine
      */
-    protected SSLParameters parameters;
+    protected SSLParametersImpl parameters;
 
     /**
      * Delegated tasks for this handshake implementation

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
index f2126ad..1a837c5 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketFactoryImpl.java
@@ -23,13 +23,13 @@ import java.security.KeyManagementException;
 
 public class OpenSSLServerSocketFactoryImpl extends javax.net.ssl.SSLServerSocketFactory {
 
-    private SSLParameters sslParameters;
+    private SSLParametersImpl sslParameters;
     private IOException instantiationException;
 
     public OpenSSLServerSocketFactoryImpl() {
         super();
         try {
-            this.sslParameters = SSLParameters.getDefault();
+            this.sslParameters = SSLParametersImpl.getDefault();
             this.sslParameters.setUseClientMode(false);
         } catch (KeyManagementException e) {
             instantiationException =
@@ -38,8 +38,8 @@ public class OpenSSLServerSocketFactoryImpl extends javax.net.ssl.SSLServerSocke
         }
     }
 
-    public OpenSSLServerSocketFactoryImpl(SSLParameters sslParameters) {
-        this.sslParameters = (SSLParameters) sslParameters.clone();
+    public OpenSSLServerSocketFactoryImpl(SSLParametersImpl sslParameters) {
+        this.sslParameters = (SSLParametersImpl) sslParameters.clone();
         this.sslParameters.setUseClientMode(false);
     }
 
@@ -52,18 +52,18 @@ public class OpenSSLServerSocketFactoryImpl extends javax.net.ssl.SSLServerSocke
     }
 
     public ServerSocket createServerSocket() throws IOException {
-        return new OpenSSLServerSocketImpl((SSLParameters) sslParameters.clone());
+        return new OpenSSLServerSocketImpl((SSLParametersImpl) sslParameters.clone());
     }
 
     public ServerSocket createServerSocket(int port) throws IOException {
-        return new OpenSSLServerSocketImpl(port, (SSLParameters) sslParameters.clone());
+        return new OpenSSLServerSocketImpl(port, (SSLParametersImpl) sslParameters.clone());
     }
 
     public ServerSocket createServerSocket(int port, int backlog)
             throws IOException {
         return new OpenSSLServerSocketImpl(port,
                                            backlog,
-                                           (SSLParameters) sslParameters.clone());
+                                           (SSLParametersImpl) sslParameters.clone());
     }
 
     public ServerSocket createServerSocket(int port,
@@ -72,6 +72,6 @@ public class OpenSSLServerSocketFactoryImpl extends javax.net.ssl.SSLServerSocke
         return new OpenSSLServerSocketImpl(port,
                                            backlog,
                                            iAddress,
-                                           (SSLParameters) sslParameters.clone());
+                                           (SSLParametersImpl) sslParameters.clone());
     }
 }

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
index 6a3e741..3d7e4a4 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
@@ -31,24 +31,24 @@ import javax.net.ssl.SSLException;
  * later, for example in the package.html or a separate reference document.
  */
 public class OpenSSLServerSocketImpl extends javax.net.ssl.SSLServerSocket {
-    private final SSLParameters sslParameters;
+    private final SSLParametersImpl sslParameters;
     private String[] enabledProtocols = NativeCrypto.getSupportedProtocols();
     private String[] enabledCipherSuites = NativeCrypto.getDefaultCipherSuites();
     private String[] enabledCompressionMethods = NativeCrypto.getDefaultCompressionMethods();
 
-    protected OpenSSLServerSocketImpl(SSLParameters sslParameters)
+    protected OpenSSLServerSocketImpl(SSLParametersImpl sslParameters)
         throws IOException {
         super();
         this.sslParameters = sslParameters;
     }
 
-    protected OpenSSLServerSocketImpl(int port, SSLParameters sslParameters)
+    protected OpenSSLServerSocketImpl(int port, SSLParametersImpl sslParameters)
         throws IOException {
         super(port);
         this.sslParameters = sslParameters;
     }
 
-    protected OpenSSLServerSocketImpl(int port, int backlog, SSLParameters sslParameters)
+    protected OpenSSLServerSocketImpl(int port, int backlog, SSLParametersImpl sslParameters)
         throws IOException {
         super(port, backlog);
         this.sslParameters = sslParameters;
@@ -57,7 +57,7 @@ public class OpenSSLServerSocketImpl extends javax.net.ssl.SSLServerSocket {
     protected OpenSSLServerSocketImpl(int port,
                                       int backlog,
                                       InetAddress iAddress,
-                                      SSLParameters sslParameters)
+                                      SSLParametersImpl sslParameters)
         throws IOException {
         super(port, backlog, iAddress);
         this.sslParameters = sslParameters;

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
index 5316385..756030b 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketFactoryImpl.java
@@ -24,13 +24,13 @@ import java.security.KeyManagementException;
 
 public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
 
-    private SSLParameters sslParameters;
+    private SSLParametersImpl sslParameters;
     private IOException instantiationException;
 
     public OpenSSLSocketFactoryImpl() {
         super();
         try {
-            sslParameters = SSLParameters.getDefault();
+            sslParameters = SSLParametersImpl.getDefault();
         } catch (KeyManagementException e) {
             instantiationException =
                 new IOException("Delayed instantiation exception:");
@@ -38,7 +38,7 @@ public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
         }
     }
 
-    public OpenSSLSocketFactoryImpl(SSLParameters sslParameters) {
+    public OpenSSLSocketFactoryImpl(SSLParametersImpl sslParameters) {
         super();
         this.sslParameters = sslParameters;
     }
@@ -55,11 +55,11 @@ public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
         if (instantiationException != null) {
             throw instantiationException;
         }
-        return new OpenSSLSocketImpl((SSLParameters) sslParameters.clone());
+        return new OpenSSLSocketImpl((SSLParametersImpl) sslParameters.clone());
     }
 
     public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-        return new OpenSSLSocketImpl(host, port, (SSLParameters) sslParameters.clone());
+        return new OpenSSLSocketImpl(host, port, (SSLParametersImpl) sslParameters.clone());
     }
 
     public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
@@ -68,11 +68,11 @@ public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
                                      port,
                                      localHost,
                                      localPort,
-                                     (SSLParameters) sslParameters.clone());
+                                     (SSLParametersImpl) sslParameters.clone());
     }
 
     public Socket createSocket(InetAddress host, int port) throws IOException {
-        return new OpenSSLSocketImpl(host, port, (SSLParameters) sslParameters.clone());
+        return new OpenSSLSocketImpl(host, port, (SSLParametersImpl) sslParameters.clone());
     }
 
     public Socket createSocket(InetAddress address,
@@ -84,7 +84,7 @@ public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
                                      port,
                                      localAddress,
                                      localPort,
-                                     (SSLParameters) sslParameters.clone());
+                                     (SSLParametersImpl) sslParameters.clone());
     }
 
     public Socket createSocket(Socket s, String host, int port, boolean autoClose)
@@ -93,6 +93,6 @@ public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
                                             host,
                                             port,
                                             autoClose,
-                                            (SSLParameters) sslParameters.clone());
+                                            (SSLParametersImpl) sslParameters.clone());
     }
 }

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
index a10ff5e..95e812e 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
@@ -62,7 +62,7 @@ public class OpenSSLSocketImpl
     private final Object handshakeLock = new Object();
     private final Object readLock = new Object();
     private final Object writeLock = new Object();
-    private SSLParameters sslParameters;
+    private SSLParametersImpl sslParameters;
     private String[] enabledProtocols;
     private String[] enabledCipherSuites;
     private String[] enabledCompressionMethods;
@@ -106,7 +106,7 @@ public class OpenSSLSocketImpl
      *            context
      * @throws IOException if network fails
      */
-    protected OpenSSLSocketImpl(SSLParameters sslParameters) throws IOException {
+    protected OpenSSLSocketImpl(SSLParametersImpl sslParameters) throws IOException {
         super();
         init(sslParameters);
     }
@@ -118,7 +118,7 @@ public class OpenSSLSocketImpl
      *            context
      * @throws IOException if network fails
      */
-    protected OpenSSLSocketImpl(SSLParameters sslParameters,
+    protected OpenSSLSocketImpl(SSLParametersImpl sslParameters,
                                 String[] enabledProtocols,
                                 String[] enabledCipherSuites,
                                 String[] enabledCompressionMethods) throws IOException {
@@ -132,7 +132,7 @@ public class OpenSSLSocketImpl
      * @throws IOException if network fails
      * @throws java.net.UnknownHostException host not defined
      */
-    protected OpenSSLSocketImpl(String host, int port, SSLParameters sslParameters)
+    protected OpenSSLSocketImpl(String host, int port, SSLParametersImpl sslParameters)
         throws IOException {
         super(host, port);
         init(sslParameters);
@@ -144,7 +144,7 @@ public class OpenSSLSocketImpl
      * @throws IOException if network fails
      * @throws java.net.UnknownHostException host not defined
      */
-    protected OpenSSLSocketImpl(InetAddress address, int port, SSLParameters sslParameters)
+    protected OpenSSLSocketImpl(InetAddress address, int port, SSLParametersImpl sslParameters)
         throws IOException {
         super(address, port);
         init(sslParameters);
@@ -159,7 +159,7 @@ public class OpenSSLSocketImpl
      */
     protected OpenSSLSocketImpl(String host, int port,
                                 InetAddress clientAddress, int clientPort,
-                                SSLParameters sslParameters)
+                                SSLParametersImpl sslParameters)
         throws IOException {
         super(host, port, clientAddress, clientPort);
         init(sslParameters);
@@ -173,7 +173,7 @@ public class OpenSSLSocketImpl
      */
     protected OpenSSLSocketImpl(InetAddress address, int port,
                                 InetAddress clientAddress, int clientPort,
-                                SSLParameters sslParameters)
+                                SSLParametersImpl sslParameters)
         throws IOException {
         super(address, port, clientAddress, clientPort);
         init(sslParameters);
@@ -186,7 +186,7 @@ public class OpenSSLSocketImpl
      * @throws IOException if network fails
      */
     protected OpenSSLSocketImpl(Socket socket, String host, int port,
-            boolean autoClose, SSLParameters sslParameters) throws IOException {
+            boolean autoClose, SSLParametersImpl sslParameters) throws IOException {
         super();
         this.socket = socket;
         this.timeout = socket.getSoTimeout();
@@ -200,7 +200,7 @@ public class OpenSSLSocketImpl
      * Initialize the SSL socket and set the certificates for the
      * future handshaking.
      */
-    private void init(SSLParameters sslParameters) throws IOException {
+    private void init(SSLParametersImpl sslParameters) throws IOException {
         init(sslParameters,
              NativeCrypto.getSupportedProtocols(),
              NativeCrypto.getDefaultCipherSuites(),
@@ -211,7 +211,7 @@ public class OpenSSLSocketImpl
      * Initialize the SSL socket and set the certificates for the
      * future handshaking.
      */
-    private void init(SSLParameters sslParameters,
+    private void init(SSLParametersImpl sslParameters,
                       String[] enabledProtocols,
                       String[] enabledCipherSuites,
                       String[] enabledCompressionMethods) throws IOException {

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
index ae66c46..df65d12 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
@@ -31,7 +31,7 @@ public class OpenSSLSocketImplWrapper extends OpenSSLSocketImpl {
     private Socket socket;
 
     protected OpenSSLSocketImplWrapper(Socket socket, String host, int port,
-            boolean autoClose, SSLParameters sslParameters) throws IOException {
+            boolean autoClose, SSLParametersImpl sslParameters) throws IOException {
         super(socket, host, port, autoClose, sslParameters);
         if (!socket.isConnected()) {
             throw new SocketException("Socket is not connected.");

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
index 3f7092d..e09230b 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
@@ -50,7 +50,7 @@ public class SSLContextImpl extends SSLContextSpi {
     /** Server session cache. */
     private final ServerSessionContext serverSessionContext;
 
-    protected SSLParameters sslParameters;
+    protected SSLParametersImpl sslParameters;
 
     public SSLContextImpl() {
         clientSessionContext = new ClientSessionContext();
@@ -73,11 +73,11 @@ public class SSLContextImpl extends SSLContextSpi {
                 clientSessionContext = DEFAULT_SSL_CONTEXT_IMPL.engineGetClientSessionContext();
                 serverSessionContext = DEFAULT_SSL_CONTEXT_IMPL.engineGetServerSessionContext();
             }
-            sslParameters = new SSLParameters(DEFAULT_SSL_CONTEXT_IMPL.getKeyManagers(),
-                                              DEFAULT_SSL_CONTEXT_IMPL.getTrustManagers(),
-                                              null,
-                                              clientSessionContext,
-                                              serverSessionContext);
+            sslParameters = new SSLParametersImpl(DEFAULT_SSL_CONTEXT_IMPL.getKeyManagers(),
+                                                  DEFAULT_SSL_CONTEXT_IMPL.getTrustManagers(),
+                                                  null,
+                                                  clientSessionContext,
+                                                  serverSessionContext);
         }
     }
 
@@ -94,8 +94,8 @@ public class SSLContextImpl extends SSLContextSpi {
     @Override
     public void engineInit(KeyManager[] kms, TrustManager[] tms,
             SecureRandom sr) throws KeyManagementException {
-        sslParameters = new SSLParameters(kms, tms, sr,
-                                          clientSessionContext, serverSessionContext);
+        sslParameters = new SSLParametersImpl(kms, tms, sr,
+                                              clientSessionContext, serverSessionContext);
     }
 
     @Override
@@ -119,7 +119,7 @@ public class SSLContextImpl extends SSLContextSpi {
         if (sslParameters == null) {
             throw new IllegalStateException("SSLContext is not initialized.");
         }
-        SSLParameters p = (SSLParameters) sslParameters.clone();
+        SSLParametersImpl p = (SSLParametersImpl) sslParameters.clone();
         p.setUseClientMode(false);
         return new SSLEngineImpl(host, port, p);
     }
@@ -129,7 +129,7 @@ public class SSLContextImpl extends SSLContextSpi {
         if (sslParameters == null) {
             throw new IllegalStateException("SSLContext is not initialized.");
         }
-        SSLParameters p = (SSLParameters) sslParameters.clone();
+        SSLParametersImpl p = (SSLParametersImpl) sslParameters.clone();
         p.setUseClientMode(false);
         return new SSLEngineImpl(p);
     }

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
index 1c83712..be8fb08 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
@@ -69,7 +69,7 @@ public class SSLEngineImpl extends SSLEngine {
     private SSLSessionImpl session;
 
     // peer configuration parameters
-    protected SSLParameters sslParameters;
+    protected SSLParametersImpl sslParameters;
 
     // in case of emergency situations when data could not be
     // placed in destination buffers it will be stored in this
@@ -80,12 +80,12 @@ public class SSLEngineImpl extends SSLEngine {
     // logger
     private Logger.Stream logger = Logger.getStream("engine");
 
-    protected SSLEngineImpl(SSLParameters sslParameters) {
+    protected SSLEngineImpl(SSLParametersImpl sslParameters) {
         super();
         this.sslParameters = sslParameters;
     }
 
-    protected SSLEngineImpl(String host, int port, SSLParameters sslParameters) {
+    protected SSLEngineImpl(String host, int port, SSLParametersImpl sslParameters) {
         super(host, port);
         this.sslParameters = sslParameters;
     }

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
similarity index 95%
rename from luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
rename to luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
index 02a1fe5..afa99b3 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
@@ -40,7 +40,7 @@ import javax.net.ssl.X509TrustManager;
  * and controls whether new SSL sessions may be established by this
  * socket or not.
  */
-public class SSLParameters implements Cloneable {
+public class SSLParametersImpl implements Cloneable {
 
     // default source of authentication keys
     private static X509KeyManager defaultKeyManager;
@@ -49,7 +49,7 @@ public class SSLParameters implements Cloneable {
     // default source of random numbers
     private static SecureRandom defaultSecureRandom;
     // default SSL parameters
-    private static SSLParameters defaultParameters;
+    private static SSLParametersImpl defaultParameters;
 
     // client session context contains the set of reusable
     // client-side SSL sessions
@@ -102,7 +102,7 @@ public class SSLParameters implements Cloneable {
      * See {@link javax.net.ssl.SSLContext#init(KeyManager[],TrustManager[],
      * SecureRandom)} for more information
      */
-    protected SSLParameters(KeyManager[] kms, TrustManager[] tms,
+    protected SSLParametersImpl(KeyManager[] kms, TrustManager[] tms,
 // BEGIN android-changed
             SecureRandom sr, ClientSessionContext clientSessionContext,
             ServerSessionContext serverSessionContext)
@@ -210,17 +210,17 @@ public class SSLParameters implements Cloneable {
         // END android-added
     }
 
-    protected static SSLParameters getDefault() throws KeyManagementException {
+    protected static SSLParametersImpl getDefault() throws KeyManagementException {
         if (defaultParameters == null) {
 // BEGIN android-changed
-            defaultParameters = new SSLParameters(null,
-                                                  null,
-                                                  null,
-                                                  new ClientSessionContext(),
-                                                  new ServerSessionContext());
+            defaultParameters = new SSLParametersImpl(null,
+                                                      null,
+                                                      null,
+                                                      new ClientSessionContext(),
+                                                      new ServerSessionContext());
 // END android-changed
         }
-        return (SSLParameters) defaultParameters.clone();
+        return (SSLParametersImpl) defaultParameters.clone();
     }
 
     /**

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
index df5485e..222ebec 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
@@ -28,7 +28,7 @@ import javax.net.ssl.SSLServerSocketFactory;
  */
 public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
 
-    private SSLParameters sslParameters;
+    private SSLParametersImpl sslParameters;
     private IOException instantiationException;
 
     /**
@@ -37,7 +37,7 @@ public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
     public SSLServerSocketFactoryImpl() {
         super();
         try {
-            this.sslParameters = SSLParameters.getDefault();
+            this.sslParameters = SSLParametersImpl.getDefault();
             this.sslParameters.setUseClientMode(false);
         } catch (KeyManagementException e) {
             instantiationException =
@@ -49,9 +49,9 @@ public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
     /**
      * Constructor.
      */
-    protected SSLServerSocketFactoryImpl(SSLParameters sslParameters) {
+    protected SSLServerSocketFactoryImpl(SSLParametersImpl sslParameters) {
         super();
-        this.sslParameters = (SSLParameters) sslParameters.clone();
+        this.sslParameters = (SSLParametersImpl) sslParameters.clone();
         this.sslParameters.setUseClientMode(false);
     }
 
@@ -85,7 +85,7 @@ public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
         if (instantiationException != null) {
             throw instantiationException;
         }
-        return new SSLServerSocketImpl((SSLParameters) sslParameters.clone());
+        return new SSLServerSocketImpl((SSLParametersImpl) sslParameters.clone());
     }
 
 
@@ -98,7 +98,7 @@ public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
             throw instantiationException;
         }
         return new SSLServerSocketImpl(port,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 
     /**
@@ -111,7 +111,7 @@ public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
             throw instantiationException;
         }
         return new SSLServerSocketImpl(port, backlog,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 
     /**
@@ -124,7 +124,7 @@ public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory {
             throw instantiationException;
         }
         return new SSLServerSocketImpl(port, backlog, iAddress,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 }
 

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
index dae1ed8..f54101f 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
@@ -34,7 +34,7 @@ public class SSLServerSocketImpl extends SSLServerSocket {
     // ssl socket, whether it require/want client authentication or not,
     // and controls whether new SSL sessions may be established by this
     // socket or not.
-    private final SSLParameters sslParameters;
+    private final SSLParametersImpl sslParameters;
 
     // logger
     private Logger.Stream logger = Logger.getStream("ssocket");
@@ -44,7 +44,7 @@ public class SSLServerSocketImpl extends SSLServerSocket {
      * @param   sslParameters:  SSLParameters
      * @throws  IOException
      */
-    protected SSLServerSocketImpl(SSLParameters sslParameters)
+    protected SSLServerSocketImpl(SSLParametersImpl sslParameters)
         throws IOException {
         super();
         this.sslParameters = sslParameters;
@@ -56,7 +56,7 @@ public class SSLServerSocketImpl extends SSLServerSocket {
      * @param   sslParameters:  SSLParameters
      * @throws  IOException
      */
-    protected SSLServerSocketImpl(int port, SSLParameters sslParameters)
+    protected SSLServerSocketImpl(int port, SSLParametersImpl sslParameters)
         throws IOException {
         super(port);
         this.sslParameters = sslParameters;
@@ -70,7 +70,7 @@ public class SSLServerSocketImpl extends SSLServerSocket {
      * @throws  IOException
      */
     protected SSLServerSocketImpl(int port, int backlog,
-            SSLParameters sslParameters) throws IOException {
+            SSLParametersImpl sslParameters) throws IOException {
         super(port, backlog);
         this.sslParameters = sslParameters;
     }
@@ -85,7 +85,7 @@ public class SSLServerSocketImpl extends SSLServerSocket {
      */
     protected SSLServerSocketImpl(int port, int backlog,
                                 InetAddress iAddress,
-                                SSLParameters sslParameters)
+                                SSLParametersImpl sslParameters)
         throws IOException {
         super(port, backlog, iAddress);
         this.sslParameters = sslParameters;
@@ -247,7 +247,7 @@ public class SSLServerSocketImpl extends SSLServerSocket {
             logger.println("SSLServerSocketImpl.accept ..");
         }
         SSLSocketImpl s = new SSLSocketImpl(
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
         implAccept(s);
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
index 8f1d94c..2701f5d 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
@@ -29,7 +29,7 @@ import javax.net.ssl.SSLSocketFactory;
  */
 public class SSLSocketFactoryImpl extends SSLSocketFactory {
 
-    private SSLParameters sslParameters;
+    private SSLParametersImpl sslParameters;
     private IOException instantiationException;
 
     /**
@@ -38,7 +38,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
     public SSLSocketFactoryImpl() {
         super();
         try {
-            sslParameters = SSLParameters.getDefault();
+            sslParameters = SSLParametersImpl.getDefault();
         } catch (KeyManagementException e) {
             instantiationException =
                 new IOException("Delayed instantiation exception:");
@@ -49,7 +49,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
     /**
      * Constructor.
      */
-    protected SSLSocketFactoryImpl(SSLParameters sslParameters) {
+    protected SSLSocketFactoryImpl(SSLParametersImpl sslParameters) {
         super();
         this.sslParameters = sslParameters;
     }
@@ -85,7 +85,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
         if (instantiationException != null) {
             throw instantiationException;
         }
-        return new SSLSocketWrapper(s, autoClose, (SSLParameters) sslParameters
+        return new SSLSocketWrapper(s, autoClose, (SSLParametersImpl) sslParameters
                 .clone());
     }
 
@@ -99,7 +99,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
         if (instantiationException != null) {
             throw instantiationException;
         }
-        return new SSLSocketImpl((SSLParameters) sslParameters.clone());
+        return new SSLSocketImpl((SSLParametersImpl) sslParameters.clone());
     }
 
     /**
@@ -112,7 +112,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
             throw instantiationException;
         }
         return new SSLSocketImpl(host, port,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 
     /**
@@ -126,7 +126,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
             throw instantiationException;
         }
         return new SSLSocketImpl(host, port, localHost, localPort,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 
     /**
@@ -139,7 +139,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
             throw instantiationException;
         }
         return new SSLSocketImpl(host, port,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 
     /**
@@ -152,7 +152,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory {
             throw instantiationException;
         }
         return new SSLSocketImpl(address, port, localAddress, localPort,
-                (SSLParameters) sslParameters.clone());
+                (SSLParametersImpl) sslParameters.clone());
     }
 
     // ------------------------------------------------------------------

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
index 8f0343e..7a10aeb 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
@@ -64,7 +64,7 @@ public class SSLSocketImpl extends SSLSocket {
     // ssl socket, whether it require/want client authentication or not,
     // and controls whether new SSL sessions may be established by this
     // socket or not.
-    protected SSLParameters sslParameters;
+    protected SSLParametersImpl sslParameters;
     // super's streams to be wrapped:
     protected InputStream input;
     protected OutputStream output;
@@ -77,11 +77,11 @@ public class SSLSocketImpl extends SSLSocket {
 
     /**
      * Constructor
-     * @param   sslParameters:  SSLParameters
+     * @param   sslParameters:  SSLParametersImpl
      * @see javax.net.ssl.SSLSocket#SSLSocket() method documentation
      * for more information.
      */
-    protected SSLSocketImpl(SSLParameters sslParameters) {
+    protected SSLSocketImpl(SSLParametersImpl sslParameters) {
         super();
         this.sslParameters = sslParameters;
         // init should be called after creation!
@@ -91,13 +91,13 @@ public class SSLSocketImpl extends SSLSocket {
      * Constructor
      * @param   host:   String
      * @param   port:   int
-     * @param   sslParameters:  SSLParameters
+     * @param   sslParameters:  SSLParametersImpl
      * @throws  IOException
      * @throws  UnknownHostException
      * @see javax.net.ssl.SSLSocket#SSLSocket(String,int)
      * method documentation for more information.
      */
-    protected SSLSocketImpl(String host, int port, SSLParameters sslParameters)
+    protected SSLSocketImpl(String host, int port, SSLParametersImpl sslParameters)
             throws IOException, UnknownHostException {
         super(host, port);
         this.sslParameters = sslParameters;
@@ -110,7 +110,7 @@ public class SSLSocketImpl extends SSLSocket {
      * @param   port:   int
      * @param   localHost:  InetAddress
      * @param   localPort:  int
-     * @param   sslParameters:  SSLParameters
+     * @param   sslParameters:  SSLParametersImpl
      * @throws  IOException
      * @throws  UnknownHostException
      * @see javax.net.ssl.SSLSocket#SSLSocket(String,int,InetAddress,int)
@@ -118,7 +118,7 @@ public class SSLSocketImpl extends SSLSocket {
      */
     protected SSLSocketImpl(String host, int port,
             InetAddress localHost, int localPort,
-            SSLParameters sslParameters) throws IOException,
+            SSLParametersImpl sslParameters) throws IOException,
             UnknownHostException {
         super(host, port, localHost, localPort);
         this.sslParameters = sslParameters;
@@ -129,14 +129,14 @@ public class SSLSocketImpl extends SSLSocket {
      * Constructor
      * @param   host:   InetAddress
      * @param   port:   int
-     * @param   sslParameters:  SSLParameters
+     * @param   sslParameters:  SSLParametersImpl
      * @return
      * @throws  IOException
      * @see javax.net.ssl.SSLSocket#SSLSocket(InetAddress,int)
      * method documentation for more information.
      */
     protected SSLSocketImpl(InetAddress host, int port,
-            SSLParameters sslParameters) throws IOException {
+            SSLParametersImpl sslParameters) throws IOException {
         super(host, port);
         this.sslParameters = sslParameters;
         init();
@@ -148,7 +148,7 @@ public class SSLSocketImpl extends SSLSocket {
      * @param   port:   int
      * @param   localAddress:   InetAddress
      * @param   localPort:  int
-     * @param   sslParameters:  SSLParameters
+     * @param   sslParameters:  SSLParametersImpl
      * @return
      * @throws  IOException
      * @see javax.net.ssl.SSLSocket#SSLSocket(InetAddress,int,InetAddress,int)
@@ -156,7 +156,7 @@ public class SSLSocketImpl extends SSLSocket {
      */
     protected SSLSocketImpl(InetAddress address, int port,
             InetAddress localAddress, int localPort,
-            SSLParameters sslParameters) throws IOException {
+            SSLParametersImpl sslParameters) throws IOException {
         super(address, port, localAddress, localPort);
         this.sslParameters = sslParameters;
         init();

diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
index 6145f62..2abc082 100644 (file)
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketWrapper.java
@@ -31,7 +31,7 @@ public class SSLSocketWrapper extends SSLSocketImpl {
     private final Socket socket;
     private final boolean autoClose;
 
-    protected SSLSocketWrapper(Socket socket, boolean autoClose, SSLParameters sslParameters) throws IOException {
+    protected SSLSocketWrapper(Socket socket, boolean autoClose, SSLParametersImpl sslParameters) throws IOException {
         super(sslParameters);
         if (!socket.isConnected()) {
             throw new SocketException("Socket is not connected.");