diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-08-08 20:19:17 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-08-08 20:19:17 +0000 |
| commit | 6c4669718d4bbcb53d429c65ba433bc216a1799d (patch) | |
| tree | 661488e0f66cc5f6eddf043fc7f53d7e2240b9b9 /java/ssl/jdk1.5/IceSSL/Instance.java | |
| parent | compiled with JDK 1.4 (diff) | |
| download | ice-6c4669718d4bbcb53d429c65ba433bc216a1799d.tar.bz2 ice-6c4669718d4bbcb53d429c65ba433bc216a1799d.tar.xz ice-6c4669718d4bbcb53d429c65ba433bc216a1799d.zip | |
fix for bug 1291 - NullPointerException if subjectAltNames are null
Diffstat (limited to 'java/ssl/jdk1.5/IceSSL/Instance.java')
| -rw-r--r-- | java/ssl/jdk1.5/IceSSL/Instance.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/java/ssl/jdk1.5/IceSSL/Instance.java b/java/ssl/jdk1.5/IceSSL/Instance.java index 55459a14f3f..e0c4e5ad209 100644 --- a/java/ssl/jdk1.5/IceSSL/Instance.java +++ b/java/ssl/jdk1.5/IceSSL/Instance.java @@ -612,19 +612,22 @@ class Instance ((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>(); - java.util.Iterator i = subjectAltNames.iterator(); - while(i.hasNext()) + if(subjectAltNames != null) { - java.util.List l = (java.util.List)i.next(); - assert(!l.isEmpty()); - Integer n = (Integer)l.get(0); - if(n.intValue() == 7) + java.util.Iterator i = subjectAltNames.iterator(); + while(i.hasNext()) { - ipAddresses.add((String)l.get(1)); - } - else if(n.intValue() == 2) - { - dnsNames.add(((String)l.get(1)).toLowerCase()); + java.util.List l = (java.util.List)i.next(); + assert(!l.isEmpty()); + Integer n = (Integer)l.get(0); + if(n.intValue() == 7) + { + ipAddresses.add((String)l.get(1)); + } + else if(n.intValue() == 2) + { + dnsNames.add(((String)l.get(1)).toLowerCase()); + } } } |