Changeset 2926 in josm

Timestamp:

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

Author:

mjulius

Message:

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

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• src/org/openstreetmap/josm/data/Version.java (modified) (2 diffs)

trunk/.classpath

@@ -4 +4 @@
         <classpathentry kind="src" path="test/unit"/>
         <classpathentry kind="src" path="test/functional"/>
-        <classpathentry excluding="build/|dist/|src/|test/|test/build/|test/functional/|test/unit/" including="data/|images/|presets/|styles/" kind="src" path=""/>
+        <classpathentry excluding="build/|dist/|src/|test/|test/build/|test/functional/|test/unit/" including="CONTRIBUTION|LICENSE|README|data/|images/|presets/|styles/" kind="src" path=""/>
         <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

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()) {