diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-05-26 17:19:30 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-05-26 17:21:09 -0700 |
| commit | 2be0ae9c8abc05d1c94c8bb170503ee2feae1866 (patch) | |
| tree | 056628562f83784571d39f1f0952c6e6bbd015f2 | |
| parent | 0c131a2ca38465b7d1df4eaee63ac73ce4d5986d (diff) | |
| download | libcore-2be0ae9c8abc05d1c94c8bb170503ee2feae1866.zip libcore-2be0ae9c8abc05d1c94c8bb170503ee2feae1866.tar.gz libcore-2be0ae9c8abc05d1c94c8bb170503ee2feae1866.tar.bz2 | |
Add missing package on ambiguous class name and cast on ambiguous type
Change-Id: I470c929f67ecaffa91d5a67c87f1ed5358cfd84c
| -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 |