Changeset 8313 in josm


Ignore:
Timestamp:
2015-05-02T19:29:16+02:00 (6 years ago)
Author:
Don-vip
Message:

fix #11397 - NPE

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

    r8308 r8313  
    1515public class CacheEntryAttributes extends ElementAttributes {
    1616    private static final long serialVersionUID = 1L; //version
    17     private transient Map<String, String> attrs = new HashMap<String, String>();
     17    private Map<String, String> attrs = new HashMap<String, String>();
    1818    private final static String NO_TILE_AT_ZOOM = "noTileAtZoom";
    1919    private final static String ETAG = "Etag";
     
    2121    private final static String EXPIRATION_TIME = "expirationTime";
    2222
     23    /**
     24     * Constructs a new {@code CacheEntryAttributes}.
     25     */
    2326    public CacheEntryAttributes() {
    2427        super();
  • trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

    r8312 r8313  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.gui.oauth;
     3
     4import java.util.Objects;
    35
    46import org.openstreetmap.josm.data.Preferences;
     
    2123    private String apiUrl;
    2224    private final AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
    23     private OAuthToken accessToken;
     25    private transient OAuthToken accessToken;
    2426
    2527    protected void fireAccessTokenChanged(OAuthToken oldValue, OAuthToken newValue) {
     
    99101        } else if (oldValue == null && this.accessToken == null) {
    100102            // no change - don't fire an event
    101         } else if (! oldValue.equals(this.accessToken)) {
     103        } else if (!Objects.equals(oldValue, this.accessToken)) {
    102104            fireAccessTokenChanged(oldValue, this.accessToken);
    103105        }
Note: See TracChangeset for help on using the changeset viewer.