Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java

Timestamp:

2018-04-19T20:37:16+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16204 - Allow to start and close JOSM in WebStart sandbox mode (where every external access is denied). This was very useful to reproduce some very tricky bugs that occured in real life but were almost impossible to diagnose.

File:

• trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java

@@ -192 +192 @@
             return;
         KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        Path cacertsPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
+        Path cacertsPath = Paths.get(Utils.getSystemProperty("java.home"), "lib", "security", "cacerts");
         try (InputStream is = Files.newInputStream(cacertsPath)) {
             keyStore.load(is, "changeit".toCharArray());
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to load keystore", e);
+            return;
         }