Changeset 204 in josm for src/org/openstreetmap/josm

Timestamp:

2007-04-02T12:46:04+02:00 (17 years ago)

Author:

imi

Message:

• Fixed the markerlayer import throwing NPE when image not found
• Fixed an Exception when server responding with an illegal HTTP-header

Location:

src/org/openstreetmap/josm

Files:

• io/BoundingBoxDownloader.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (1 diff)

src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -66 +66 @@
                 data.add(list);
                 return data;
+        } catch (IllegalArgumentException e) {
+                // caused by HttpUrlConnection in case of illegal stuff in the response
+                if (cancel)
+                        return null;
+                throw e;
         } catch (IOException e) {
                 if (cancel)

src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -77 +77 @@
                 }
                 if (path == null)
-                        throw new NullPointerException("/images/"+subdir+name+ext+" not found");
+                        return null;
                 Image img = cache.get(path);
                 if (img == null) {