Changeset 14114 in josm

Timestamp:

2018-08-10T00:09:07+02:00 (6 years ago)

Author:

Don-vip

Message:

fix NPE seen in integration test

File:

• trunk/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/preferences/AbstractToStringProperty.java

@@ -123 +123 @@
     protected String getAsString() {
         T def = getDefaultValue();
-        return getPreferences().get(key, def == null ? "" : toString(def));
+        String sdef = def == null ? "" : toString(def);
+        return getPreferences() != null ? getPreferences().get(key, sdef) : sdef;
     }