Changeset 5111 in josm for trunk/src/org

Timestamp:

2012-03-21T23:15:32+01:00 (14 years ago)

Author:

simon04

Message:

fix #7532 - NPE in CredentialsManager

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/CredentialDialog.java (modified) (2 diffs)
• io/auth/CredentialsManager.java (modified) (1 diff)
• io/auth/JosmPreferencesCredentialAgent.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

@@ -38 +38 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -44 +45 @@
     static public CredentialDialog getOsmApiCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) {
         CredentialDialog dialog = new CredentialDialog(saveUsernameAndPasswordCheckboxText);
-        if(OsmApi.getOsmApi().getHost().equals(host)) {
+        if (Utils.equal(OsmApi.getOsmApi().getHost(), host)) {
             dialog.prepareForOsmApiCredentials(username, password);
         } else {

trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

@@ -92 +92 @@
     @Override
     public void store(RequestorType requestorType, String host, PasswordAuthentication credentials) throws CredentialsAgentException {
-        if (requestorType == RequestorType.SERVER && OsmApi.getOsmApi().getHost().equals(host)) {
+        if (requestorType == RequestorType.SERVER && Utils.equal(OsmApi.getOsmApi().getHost(), host)) {
             String username = credentials.getUserName();
             if(username != null && !username.trim().isEmpty()) {

trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -34 +35 @@
         switch(requestorType) {
         case SERVER:
-            if(OsmApi.getOsmApi().getHost().equals(host)) {
+            if (Utils.equal(OsmApi.getOsmApi().getHost(), host)) {
                 user = Main.pref.get("osm-server.username", null);
                 password = Main.pref.get("osm-server.password", null);
@@ -66 +67 @@
         switch(requestorType) {
         case SERVER:
-            if(OsmApi.getOsmApi().getHost().equals(host)) {
+            if (Utils.equal(OsmApi.getOsmApi().getHost(), host)) {
                 Main.pref.put("osm-server.username", credentials.getUserName());
                 if (credentials.getPassword() == null) {