Changeset 34443 in osm for applications/editors/josm

Timestamp:

2018-08-09T23:48:03+02:00 (6 years ago)

Author:

donvip

Message:

fix NPE seen in integration test

File:

• applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java

@@ -124 +124 @@
                 try (FileWriter fw = new FileWriter(new File(PLUGINPROPERTIES_PATH))) {
                     URL propertiesURL = getClass().getResource("resources/" + PLUGINPROPERTIES_FILENAME);
-                    pluginProps = new Properties();
-                    pluginProps.load(propertiesURL.openStream());
-                    pluginProps.store(fw, null);
+                    if (propertiesURL != null) {
+                        pluginProps = new Properties();
+                        pluginProps.load(propertiesURL.openStream());
+                        pluginProps.store(fw, null);
+                    }
                 }
                 logger.debug("Plugin properties loaded");
@@ -134 +136 @@
                 try (FileWriter fw = new FileWriter(new File(LOGGING_PROPERTIES_FILEPATH))) {
                     URL propertiesURL = getClass().getResource("resources/log4j.properties");
-                    Properties loggingProps = new Properties();
-                    loggingProps.load(propertiesURL.openStream());
-                    loggingProps.store(fw, null);
+                    if (propertiesURL != null) {
+                        Properties loggingProps = new Properties();
+                        loggingProps.load(propertiesURL.openStream());
+                        loggingProps.store(fw, null);
+                    }
                 }
                 logger.debug("Logging properties created");