Changeset 7050 in josm

Timestamp:

2014-05-02T03:01:08+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar - Nullcheck of value previously dereferenced

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)
• io/OsmServerBackreferenceReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -83 +83 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -736 +737 @@
     }
 
-    public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd) {
+    public static Command addPrimitivesToRelation(final Relation orig, Collection<? extends OsmPrimitive> primitivesToAdd) throws IllegalArgumentException {
+        CheckParameterUtil.ensureParameterNotNull(orig, "orig");
         try {
             final Collection<TaggingPreset> presets = TaggingPreset.getMatchingPresets(EnumSet.of(TaggingPresetType.RELATION), orig.getKeys(), false);
@@ -742 +744 @@
             boolean modified = false;
             for (OsmPrimitive p : primitivesToAdd) {
-                if (p instanceof Relation && orig != null && orig.equals(p)) {
+                if (p instanceof Relation && orig.equals(p)) {
                     warnOfCircularReferences(p);
                     continue;

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -264 +264 @@
             visitor.merge();
             ret = visitor.getTargetDataSet();
-            readIncompletePrimitives(ret, progressMonitor.createSubTaskMonitor(1, false));
             if (ret != null) {
+                readIncompletePrimitives(ret, progressMonitor.createSubTaskMonitor(1, false));
                 ret.deleteInvisible();
             }