Changeset 3513 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-09-04T15:52:04+02:00 (14 years ago)

Author:

bastiK

Message:

fixed #4259 - Authentication dialog appears several times while uploading a changeset

File:

• trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java (modified) (1 diff)

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

@@ -85 +85 @@
         /*
          * Last request was successful and there was no credentials stored
-         * in file. -> Try to recall credentials that have been entered
+         * in file (or only the username is stored).
+         * -> Try to recall credentials that have been entered
          * manually in this session.
          */
-        if (!noSuccessWithLastResponse && credentials == null && memoryCredentialsCache.containsKey(requestorType)) {
+        if (!noSuccessWithLastResponse && memoryCredentialsCache.containsKey(requestorType) &&
+                (credentials == null || credentials.getPassword() == null || credentials.getPassword().length == 0)) {
             PasswordAuthentication pa = memoryCredentialsCache.get(requestorType);
             response.setUsername(pa.getUserName());