Changeset 11796 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-31T00:08:09+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)
• data/osm/Node.java (modified) (1 diff)
• data/osm/event/DatasetEventManager.java (modified) (1 diff)
• tools/ExceptionUtil.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -184 +184 @@
                 case SUCCESS:
                     handleNoTileAtZoom();
-                    int httpStatusCode = attributes.getResponseCode();
-                    if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
-                        if (attributes.getErrorMessage() == null) {
-                            tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
-                        } else {
-                            tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
+                    if (attributes != null) {
+                        int httpStatusCode = attributes.getResponseCode();
+                        if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
+                            if (attributes.getErrorMessage() == null) {
+                                tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
+                            } else {
+                                tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
+                            }
+                            status = false;
                         }
-                        status = false;
                     }
                     status &= tryLoadTileImage(object); //try to keep returned image as background

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -403 +403 @@
             return true;
         }
-        if (hops > 0) {
+        if (hops > 0 && visited != null) {
             visited.add(this);
             for (final Way w : Utils.filteredCollection(this.getReferrers(), Way.class)) {

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -86 +86 @@
 
                 // Fire consolidated event
-                fireConsolidatedEvents(inEDTListeners, consolidatedEvent);
+                if (consolidatedEvent != null) {
+                    fireConsolidatedEvents(inEDTListeners, consolidatedEvent);
+                }
             }
         }

trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

@@ -15 +15 @@
 import java.util.Collection;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeSet;
@@ -657 +658 @@
      */
     public static String explainOsmTransferException(OsmTransferException e) {
+        Objects.requireNonNull(e, "e");
         if (getNestedException(e, SecurityException.class) != null)
             return explainSecurityException(e);