Changeset 8313 in josm for trunk/src/org/openstreetmap/josm/gui/oauth

Timestamp:

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

Author:

Don-vip

Message:

fix #11397 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (modified) (3 diffs)

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);
         }