Changeset 8313 in josm for trunk/src/org

Timestamp:

2015-05-02T19:29:16+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11397 - NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/CacheEntryAttributes.java (modified) (2 diffs)
• gui/oauth/AbstractAuthorizationUI.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -15 +15 @@
 public class CacheEntryAttributes extends ElementAttributes {
     private static final long serialVersionUID = 1L; //version
-    private transient Map<String, String> attrs = new HashMap<String, String>();
+    private Map<String, String> attrs = new HashMap<String, String>();
     private final static String NO_TILE_AT_ZOOM = "noTileAtZoom";
     private final static String ETAG = "Etag";
@@ -21 +21 @@
     private final static String EXPIRATION_TIME = "expirationTime";
 
+    /**
+     * Constructs a new {@code CacheEntryAttributes}.
+     */
     public CacheEntryAttributes() {
         super();

trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.oauth;
+
+import java.util.Objects;
 
 import org.openstreetmap.josm.data.Preferences;
@@ -21 +23 @@
     private String apiUrl;
     private final AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
-    private OAuthToken accessToken;
+    private transient OAuthToken accessToken;
 
     protected void fireAccessTokenChanged(OAuthToken oldValue, OAuthToken newValue) {
@@ -99 +101 @@
         } else if (oldValue == null && this.accessToken == null) {
             // no change - don't fire an event
-        } else if (! oldValue.equals(this.accessToken)) {
+        } else if (!Objects.equals(oldValue, this.accessToken)) {
             fireAccessTokenChanged(oldValue, this.accessToken);
         }