Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

Timestamp:

02.08.2009 14:36:40 (3 years ago)

Author:

Gubaer

Message:

towards a fix for #3142: JOSM applet class no longer functional

File:

• trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) (4 diffs)

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

@@ -20 +20 @@
 import java.util.StringTokenizer;
 import java.util.Map.Entry;
+import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -37 +38 @@
  */
 public class ServerSidePreferences extends Preferences {
+    static private final Logger logger = Logger.getLogger(ServerSidePreferences.class.getName());
 
     private final Connection connection;
@@ -181 +183 @@
 
     @Override public Collection<Bookmark> loadBookmarks() {
+        URL url = null;
         try {
             Collection<Bookmark> bookmarks;
-            BufferedReader in = new BufferedReader(new InputStreamReader(new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks").openStream()));
             bookmarks = new LinkedList<Bookmark>();
+            url = new URL("http://"+connection.serverUrl.getHost()+"/josm/bookmarks");
+            BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
+
             for (String line = in.readLine(); line != null; line = in.readLine()) {
                 StringTokenizer st = new StringTokenizer(line, ",");
@@ -209 +214 @@
         } catch (IOException e) {
             e.printStackTrace();
+        } catch(SecurityException e) {
+            e.printStackTrace();
+            logger.warning(tr("Failed to load bookmarks from ''{0}'' for security reasons. Exception was: {1}",  url == null ? "null" : url.toExternalForm(), e.toString()));
         }
         return Collections.emptyList();