diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-12-13 18:14:49 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-12-13 18:14:49 -0800 |
| commit | f8cea6365206b098d8f4b2df17ae9a986f5be52c (patch) | |
| tree | 2ad2cea18fdf1b9ba8666aecec8042be69e6af7d /java/src | |
| parent | minor edits to CHANGES (diff) | |
| download | ice-f8cea6365206b098d8f4b2df17ae9a986f5be52c.tar.bz2 ice-f8cea6365206b098d8f4b2df17ae9a986f5be52c.tar.xz ice-f8cea6365206b098d8f4b2df17ae9a986f5be52c.zip | |
bug 3534: truststore defaults to keystore
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceSSL/Instance.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/IceSSL/Instance.java b/java/src/IceSSL/Instance.java index 866d0d62821..19a0daa69ad 100644 --- a/java/src/IceSSL/Instance.java +++ b/java/src/IceSSL/Instance.java @@ -524,6 +524,10 @@ class Instance } } } + else + { + ts = keys; + } // // Collect the trust managers. |