Changeset 11906 in josm


Ignore:
Timestamp:
2017-04-14T21:29:52+02:00 (8 months ago)
Author:
stoecker
Message:

fix NPE caused by variable case mismatch exposed by r11901

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

    r11901 r11906  
    118118     * verified pair of user name and user id.
    119119     *
    120      * @param username the user name. Must not be null. Must not be empty.
    121      * @param userinfo additional information about the user, retrieved from the OSM server and including the user id
     120     * @param userName the user name. Must not be null. Must not be empty.
     121     * @param userInfo additional information about the user, retrieved from the OSM server and including the user id
    122122     * @throws IllegalArgumentException if userName is null
    123123     * @throws IllegalArgumentException if userName is empty
    124      * @throws IllegalArgumentException if userinfo is null
    125      */
    126     public void setFullyIdentified(String username, UserInfo userinfo) {
    127         CheckParameterUtil.ensureParameterNotNull(username, "username");
     124     * @throws IllegalArgumentException if userInfo is null
     125     */
     126    public void setFullyIdentified(String userName, UserInfo userInfo) {
     127        CheckParameterUtil.ensureParameterNotNull(userName, "userName");
    128128        String trimmedUserName = userName.trim();
    129129        if (trimmedUserName.isEmpty())
    130130            throw new IllegalArgumentException(tr("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
    131         CheckParameterUtil.ensureParameterNotNull(userinfo, "userinfo");
     131        CheckParameterUtil.ensureParameterNotNull(userInfo, "userInfo");
    132132        this.userName = trimmedUserName;
    133         this.userInfo = userinfo;
     133        this.userInfo = userInfo;
    134134    }
    135135
Note: See TracChangeset for help on using the changeset viewer.