Changeset 4690 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java

Timestamp:

2011-12-21T23:12:59+01:00 (14 years ago)

Author:

stoecker

Message:

see #7086 - fix passing auth information to wrong server

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java

@@ -23 +23 @@
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialAgent;
+import org.openstreetmap.josm.io.OsmApi;
 
 /**
@@ -94 +95 @@
             decorationPanel.removeAll();
             decorationPanel.add(cm.getPreferencesDecorationPanel(), BorderLayout.CENTER);
-            PasswordAuthentication pa = cm.lookup(RequestorType.SERVER);
+            PasswordAuthentication pa = cm.lookup(RequestorType.SERVER, OsmApi.getOsmApi().getHost());
             if (pa == null) {
                 tfOsmUserName.setText("");
@@ -118 +119 @@
                     tfOsmPassword.getPassword()
             );
-            cm.store(RequestorType.SERVER, pa);
+            cm.store(RequestorType.SERVER, OsmApi.getOsmApi().getHost(), pa);
         } catch(CredentialsAgentException e) {
             e.printStackTrace();