Changeset 12124 in josm for trunk

Timestamp:

2017-05-12T00:57:25+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #13855 - abort HTTPS certificate setup if JDK-8172244 occurs

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -333 +333 @@
         KeyStore ks = getRootKeystore();
         // Look for certificate to install
-        String alias = ks.getCertificateAlias(trustedCert.getTrustedCertificate());
-        if (alias != null) {
-            // JOSM certificate found, return
-            Main.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
+        try {
+            String alias = ks.getCertificateAlias(trustedCert.getTrustedCertificate());
+            if (alias != null) {
+                // JOSM certificate found, return
+                Main.debug(tr("JOSM localhost certificate found in {0} keystore: {1}", WINDOWS_ROOT, alias));
+                return false;
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            // catch error of JDK-8172244 as bug seems to not be fixed anytime soon
+            Main.error(e, "JDK-8172244 occured. Abort HTTPS setup");
             return false;
         }