Make OpenSSLSocketFactory and SSLSocketFactory fields final
Bug: 2954292
Change-Id: I4cad068d4da39a9c55ca25fad698f3ea136f2e24
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 756030b..41c58b6 100644
--- 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,23 +24,25 @@
public class OpenSSLSocketFactoryImpl extends javax.net.ssl.SSLSocketFactory {
- private SSLParametersImpl sslParameters;
- private IOException instantiationException;
+ private final SSLParametersImpl sslParameters;
+ private final IOException instantiationException;
public OpenSSLSocketFactoryImpl() {
- super();
+ SSLParametersImpl sslParametersLocal = null;
+ IOException instantiationExceptionLocal = null;
try {
- sslParameters = SSLParametersImpl.getDefault();
+ sslParametersLocal = SSLParametersImpl.getDefault();
} catch (KeyManagementException e) {
- instantiationException =
- new IOException("Delayed instantiation exception:");
- instantiationException.initCause(e);
+ instantiationExceptionLocal = new IOException("Delayed instantiation exception:");
+ instantiationExceptionLocal.initCause(e);
}
+ this.sslParameters = sslParametersLocal;
+ this.instantiationException = instantiationExceptionLocal;
}
public OpenSSLSocketFactoryImpl(SSLParametersImpl sslParameters) {
- super();
this.sslParameters = sslParameters;
+ this.instantiationException = null;
}
public String[] getDefaultCipherSuites() {
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 2701f5d..4e185fd 100644
--- 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,29 +29,31 @@
*/
public class SSLSocketFactoryImpl extends SSLSocketFactory {
- private SSLParametersImpl sslParameters;
- private IOException instantiationException;
+ private final SSLParametersImpl sslParameters;
+ private final IOException instantiationException;
/**
* Constructor.
*/
public SSLSocketFactoryImpl() {
- super();
+ SSLParametersImpl sslParametersLocal = null;
+ IOException instantiationExceptionLocal = null;
try {
- sslParameters = SSLParametersImpl.getDefault();
+ sslParametersLocal = SSLParametersImpl.getDefault();
} catch (KeyManagementException e) {
- instantiationException =
- new IOException("Delayed instantiation exception:");
- instantiationException.initCause(e);
+ instantiationExceptionLocal = new IOException("Delayed instantiation exception:");
+ instantiationExceptionLocal.initCause(e);
}
+ this.sslParameters = sslParametersLocal;
+ this.instantiationException = instantiationExceptionLocal;
}
/**
* Constructor.
*/
protected SSLSocketFactoryImpl(SSLParametersImpl sslParameters) {
- super();
this.sslParameters = sslParameters;
+ this.instantiationException = null;
}
/**