diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
| commit | f3c3029ff651d294a1a0df0e79e72771307310fc (patch) | |
| tree | 1f061a96f5f46051b6daf45ccbdb63ebd2cdd746 /java/src/IceSSL/Instance.java | |
| parent | Fixed and moved fixVersion.py/fixCopyright.py (diff) | |
| download | ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.bz2 ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.xz ice-f3c3029ff651d294a1a0df0e79e72771307310fc.zip | |
using Java5 types in Ice core; general cleanup
Diffstat (limited to 'java/src/IceSSL/Instance.java')
| -rw-r--r-- | java/src/IceSSL/Instance.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java index 001a4af5863..7da138e6c78 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/IceSSL/Instance.java @@ -659,10 +659,10 @@ class Instance CipherExpression ce = (CipherExpression)_ciphers[i]; if(ce.not) { - java.util.Iterator e = result.iterator(); + java.util.Iterator<String> e = result.iterator(); while(e.hasNext()) { - String cipher = (String)e.next(); + String cipher = e.next(); if(ce.cipher != null) { if(ce.cipher.equals(cipher)) @@ -752,16 +752,16 @@ class Instance { try { - java.util.Collection subjectAltNames = + java.util.Collection<java.util.List<?> > subjectAltNames = ((java.security.cert.X509Certificate)info.certs[0]).getSubjectAlternativeNames(); java.util.ArrayList<String> ipAddresses = new java.util.ArrayList<String>(); java.util.ArrayList<String> dnsNames = new java.util.ArrayList<String>(); if(subjectAltNames != null) { - java.util.Iterator i = subjectAltNames.iterator(); + java.util.Iterator<java.util.List<?> > i = subjectAltNames.iterator(); while(i.hasNext()) { - java.util.List l = (java.util.List)i.next(); + java.util.List<?> l = i.next(); assert(!l.isEmpty()); Integer n = (Integer)l.get(0); if(n.intValue() == 7) |