Changeset 4025 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-04-15T21:09:55+02:00 (13 years ago)

Author:

stoecker

Message:

see #6213 - improve error handling

File:

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

trunk/src/org/openstreetmap/josm/data/osm/User.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
 import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.MirroredInputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
 
 /**
@@ -109 +113 @@
         relicensingUsers = new HashSet<Long>();
         try {
-        MirroredInputStream stream = new MirroredInputStream("http://planet.openstreetmap.org/users_agreed/users_agreed.txt", 7200);
-        InputStreamReader r;
-        r = new InputStreamReader(stream);
-        BufferedReader reader = new BufferedReader(r);
-        String line;
-        while ((line = reader.readLine()) != null) {
-            if (line.startsWith("#")) continue;
+            MirroredInputStream stream = new MirroredInputStream(Main.pref.get("url.licensechange",
+            "http://planet.openstreetmap.org/users_agreed/users_agreed.txt"), 7200);
             try {
-                relicensingUsers.add(new Long(Long.parseLong(line.trim())));
-            } catch (java.lang.NumberFormatException ex) {
+                InputStreamReader r;
+                r = new InputStreamReader(stream);
+                BufferedReader reader = new BufferedReader(r);
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if (line.startsWith("#")) continue;
+                    try {
+                        relicensingUsers.add(new Long(Long.parseLong(line.trim())));
+                    } catch (java.lang.NumberFormatException ex) {
+                    }
+                }
             }
-        }
-        stream.close();
-        } catch (java.io.IOException ex) {
+            finally {
+                stream.close();
+            }
+        } catch (IOException ex) {
         }
     }