Changeset 6831 in josm for trunk

Timestamp:

2014-02-10T12:07:07+01:00 (10 years ago)

Author:

akks

Message:

fix #9703: key>value in search or filter gave NPE for non-existing key

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -538 +538 @@
         public boolean match(OsmPrimitive osm) {
             int compareResult;
+            String currentValue = osm.get(key);
+            if (currentValue == null) return false;
             try {
                 compareResult = Double.compare(
-                        Double.parseDouble(osm.get(key)),
+                        Double.parseDouble(currentValue),
                         Double.parseDouble(referenceValue)
                 );
-            } catch (Exception ignore) {
+            } catch (NumberFormatException ignore) {
                 compareResult = osm.get(key).compareTo(referenceValue);
             }