Changeset 17660 in josm for trunk/src

Timestamp:

2021-03-24T23:10:58+01:00 (3 years ago)

Author:

Don-vip

Message:

see #18737 - add JNLP robustness in order to be able to start unsigned JAR with OpenWebStart

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestartAction.java (modified) (1 diff)
• tools/I18n.java (modified) (1 diff)
• tools/Logging.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -142 +142 @@
 
     private static boolean isExecutableFile(File f) {
-        return f.isFile() && f.canExecute();
+        try {
+            return f.isFile() && f.canExecute();
+        } catch (SecurityException e) {
+            Logging.error(e);
+            return false;
+        }
     }
 

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

@@ -397 +397 @@
             System.err.println("Unable to set locale providers: " + e.getMessage());
         }
-        return System.setProperty("java.locale.providers", "JRE,CLDR");
+        try {
+            return System.setProperty("java.locale.providers", "JRE,CLDR");
+        } catch (SecurityException e) {
+            // Don't call Logging class, it may not be fully initialized yet
+            System.err.println("Unable to set locale providers: " + e.getMessage());
+            return null;
+        }
     }
 

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

@@ -120 +120 @@
                 // output stream is set to
                 this.outputStreamMemo = outputStream;
-                super.setOutputStream(outputStream);
+                try {
+                    super.setOutputStream(outputStream);
+                } catch (SecurityException e) {
+                    System.err.println("Unable to set logging output stream: " + e.getMessage());
+                }
             }
         }