diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-04-28 18:04:10 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-04-28 18:04:10 -0400 |
| commit | 5245bab0b27fa9dfe54f096e0da86e63426af3f0 (patch) | |
| tree | 299fa6f3a031eb032741dd578a6d82c46994f6a6 /java/src/IceGridGUI/SessionKeeper.java | |
| parent | Fixed SSL-related bugs (diff) | |
| parent | Mac OS X workaround to correctly setup the default dir of the file chooser (diff) | |
| download | ice-5245bab0b27fa9dfe54f096e0da86e63426af3f0.tar.bz2 ice-5245bab0b27fa9dfe54f096e0da86e63426af3f0.tar.xz ice-5245bab0b27fa9dfe54f096e0da86e63426af3f0.zip | |
Merge branch 'master' of ssh://git/home/git/ice
Conflicts:
java/src/IceGridGUI/SessionKeeper.java
Diffstat (limited to 'java/src/IceGridGUI/SessionKeeper.java')
| -rwxr-xr-x | java/src/IceGridGUI/SessionKeeper.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java index 63e1fb9985d..e68a1be189c 100755 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/SessionKeeper.java @@ -574,6 +574,7 @@ class SessionKeeper setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); final File defaultDir = new File(_coordinator.getProperties().getProperty("IceSSL.DefaultDir")).getAbsoluteFile(); + _keystoreType = _coordinator.getProperties().getPropertyWithDefault("IceSSL.KeystoreType", java.security.KeyStore.getDefaultType()); |