diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-06-26 10:22:00 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-06-26 10:22:00 -0700 |
| commit | bdd7b47ab37973ed6cdd192c126901aa823ed1b0 (patch) | |
| tree | 017d90475d8922065b753068d620831670dc1a40 /java/ssl/jdk1.4/IceSSL/TrustManager.java | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-bdd7b47ab37973ed6cdd192c126901aa823ed1b0.tar.bz2 ice-bdd7b47ab37973ed6cdd192c126901aa823ed1b0.tar.xz ice-bdd7b47ab37973ed6cdd192c126901aa823ed1b0.zip | |
fixing NPE in IceSSL for Java & updating IceSSL test
Diffstat (limited to 'java/ssl/jdk1.4/IceSSL/TrustManager.java')
| -rw-r--r-- | java/ssl/jdk1.4/IceSSL/TrustManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/ssl/jdk1.4/IceSSL/TrustManager.java b/java/ssl/jdk1.4/IceSSL/TrustManager.java index 1374b99dfec..d53cdf74273 100644 --- a/java/ssl/jdk1.4/IceSSL/TrustManager.java +++ b/java/ssl/jdk1.4/IceSSL/TrustManager.java @@ -87,7 +87,7 @@ class TrustManager // // If there is no certificate then we match false. // - if(info.certs.length != 0) + if(info.certs != null && info.certs.length > 0) { javax.security.auth.x500.X500Principal subjectDN = (javax.security.auth.x500.X500Principal) ((java.security.cert.X509Certificate)info.certs[0]).getSubjectX500Principal(); |