Changeset 11544 in josm for trunk/src/org/openstreetmap/josm/io/OsmConnection.java

Timestamp:

2017-02-09T00:54:57+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

File:

• trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) (1 diff)

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

@@ -67 +67 @@
             throw new OsmTransferException(e);
         }
-        String token;
-        if (response == null) {
-            token = ":";
-        } else if (response.isCanceled()) {
-            cancel = true;
-            return;
-        } else {
-            String username = response.getUsername() == null ? "" : response.getUsername();
-            String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
-            token = username + ':' + password;
-            con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+        if (response != null) {
+            if (response.isCanceled()) {
+                cancel = true;
+                return;
+            } else {
+                String username = response.getUsername() == null ? "" : response.getUsername();
+                String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
+                String token = username + ':' + password;
+                con.setHeader("Authorization", "Basic "+Base64.getEncoder().encodeToString(token.getBytes(StandardCharsets.UTF_8)));
+            }
         }
     }