Changeset 2926 in josm for trunk/src

Timestamp:

2010-02-02T23:42:49+01:00 (10 years ago)

Author:

mjulius

Message:

Fix NPE when CONTRIBUTION|LICENSE|README files are not found

File:

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

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

@@ -34 +34 @@
      */
     static public String loadResourceFile(URL resource) {
+        if (resource == null) return null;
         BufferedReader in;
         String s = null;
@@ -74 +75 @@
         Pattern p = Pattern.compile("^([^:]+):(.*)$");
         for (String line: content.split("\n")) {
-            if (line == null || line.trim().equals("")) continue;
-            if (line.matches("^\\s*#.*$")) continue;
+            if (line == null || line.trim().equals("")) {
+                continue;
+            }
+            if (line.matches("^\\s*#.*$")) {
+                continue;
+            }
             Matcher m = p.matcher(line);
             if (m.matches()) {