Changeset 4564 in josm

Timestamp:

Nov 2, 2011 1:57:30 PM (19 months ago)

Author:

Don-vip

Message:

fix #7027 - Fixes the two reasons why rename fail under Windows (handle kept open and fails if backup already exist)

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -452 +452 @@
                     new FileInputStream(getPreferencesDir()+"preferences"), "utf-8"));
             /* FIXME: TODO: remove old style config file end of 2012 */
-            in.mark(1);
-            int v = in.read();
-            in.reset();
-            if(v == '<') {
-                fromXML(in);
-            } else {
-                loadedXML = false;
-                int lineNumber = 0;
-                ArrayList<Integer> errLines = new ArrayList<Integer>();
-                for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
-                    final int i = line.indexOf('=');
-                    if (i == -1 || i == 0) {
-                        errLines.add(lineNumber);
-                        continue;
+            try {
+                in.mark(1);
+                int v = in.read();
+                in.reset();
+                if(v == '<') {
+                    fromXML(in);
+                } else {
+                    loadedXML = false;
+                    int lineNumber = 0;
+                    ArrayList<Integer> errLines = new ArrayList<Integer>();
+                    for (String line = in.readLine(); line != null; line = in.readLine(), lineNumber++) {
+                        final int i = line.indexOf('=');
+                        if (i == -1 || i == 0) {
+                            errLines.add(lineNumber);
+                            continue;
+                        }
+                        String key = line.substring(0,i);
+                        String value = line.substring(i+1);
+                        if (!value.isEmpty()) {
+                            properties.put(key, value);
+                        }
                     }
-                    String key = line.substring(0,i);
-                    String value = line.substring(i+1);
-                    if (!value.isEmpty()) {
-                        properties.put(key, value);
-                    }
+                    if (!errLines.isEmpty())
+                        throw new IOException(tr("Malformed config file at lines {0}", errLines));
                 }
-                if (!errLines.isEmpty())
-                    throw new IOException(tr("Malformed config file at lines {0}", errLines));
+            } finally {
+                in.close();
             }
         }
@@ -551 +555 @@
                     JOptionPane.ERROR_MESSAGE
             );
+            if (backupFile.exists()) {
+                backupFile.delete();
+            }
             preferenceFile.renameTo(backupFile);
             try {