Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/gui/layer

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/gui/layer/AutosaveTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.Utils.getSystemProperty;
 
 import java.io.BufferedReader;
@@ -383 +384 @@
     public List<File> getUnsavedLayersFiles() {
         List<File> result = new ArrayList<>();
-        File[] files = autosaveDir.listFiles((FileFilter)
-                pathname -> OsmImporter.FILE_FILTER.accept(pathname) || NoteImporter.FILE_FILTER.accept(pathname));
-        if (files == null)
-            return result;
-        for (File file: files) {
-            if (file.isFile()) {
-                boolean skipFile = false;
-                File pidFile = getPidFile(file);
-                if (pidFile.exists()) {
-                    try (BufferedReader reader = Files.newBufferedReader(pidFile.toPath(), StandardCharsets.UTF_8)) {
-                        String jvmId = reader.readLine();
-                        if (jvmId != null) {
-                            String pid = jvmId.split("@")[0];
-                            skipFile = jvmPerfDataFileExists(pid);
+        try {
+            File[] files = autosaveDir.listFiles((FileFilter)
+                    pathname -> OsmImporter.FILE_FILTER.accept(pathname) || NoteImporter.FILE_FILTER.accept(pathname));
+            if (files == null)
+                return result;
+            for (File file: files) {
+                if (file.isFile()) {
+                    boolean skipFile = false;
+                    File pidFile = getPidFile(file);
+                    if (pidFile.exists()) {
+                        try (BufferedReader reader = Files.newBufferedReader(pidFile.toPath(), StandardCharsets.UTF_8)) {
+                            String jvmId = reader.readLine();
+                            if (jvmId != null) {
+                                String pid = jvmId.split("@")[0];
+                                skipFile = jvmPerfDataFileExists(pid);
+                            }
+                        } catch (IOException | SecurityException t) {
+                            Logging.error(t);
                         }
-                    } catch (IOException | SecurityException t) {
-                        Logging.error(t);
                     }
-                }
-                if (!skipFile) {
-                    result.add(file);
-                }
-            }
+                    if (!skipFile) {
+                        result.add(file);
+                    }
+                }
+            }
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_ERROR, "Unable to list unsaved layers files", e);
         }
         return result;
@@ -411 +416 @@
 
     private static boolean jvmPerfDataFileExists(final String jvmId) {
-        File jvmDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "hsperfdata_" + System.getProperty("user.name"));
+        File jvmDir = new File(getSystemProperty("java.io.tmpdir") + File.separator + "hsperfdata_" + getSystemProperty("user.name"));
         if (jvmDir.exists() && jvmDir.canRead()) {
             File[] files = jvmDir.listFiles((FileFilter) file -> file.getName().equals(jvmId) && file.isFile());