diff options
| -rw-r--r-- | luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java | 2 | ||||
| -rw-r--r-- | luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 c67b151..8e6bb59 100644 --- 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 @@ -168,7 +168,7 @@ public class SSLContextImpl extends SSLContextSpi { return createSSLParameters(true); } - private SSLParameters createSSLParameters (boolean supported) { + private javax.net.ssl.SSLParameters createSSLParameters (boolean supported) { try { SSLSocket s = (SSLSocket) engineGetSocketFactory().createSocket(); javax.net.ssl.SSLParameters p = new javax.net.ssl.SSLParameters(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java index 8e2e093..a578f72 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java @@ -76,7 +76,7 @@ public class KeyStoreBuilderParametersTest extends TestCase { //Null parameter try { - KeyStoreBuilderParameters ksp = new KeyStoreBuilderParameters(null); + KeyStoreBuilderParameters ksp = new KeyStoreBuilderParameters((List)null); fail("NullPointerException should be thrown"); } catch (NullPointerException npe) { //expected |