Changeset 7067 in josm for trunk

Timestamp:

2014-05-05T20:51:11+02:00 (11 years ago)

Author:

Don-vip

Message:

fix NPE seen in test if no password is set with basic auth (headless mode)

File:

• trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (modified) (2 diffs)

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

@@ -14 +14 @@
     protected Map<RequestorType, PasswordAuthentication> memoryCredentialsCache = new HashMap<>();
 
-    /**
-     * @see CredentialsAgent#getCredentials
-     */
     @Override
-    public CredentialsAgentResponse getCredentials(final RequestorType requestorType, final String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
+    public CredentialsAgentResponse getCredentials(final RequestorType requestorType, final String host, boolean noSuccessWithLastResponse)
+            throws CredentialsAgentException {
         if (requestorType == null)
             return null;
@@ -63 +61 @@
                 }
             });
-            if (response.isCanceled()) {
+            if (response.isCanceled() || response.getUsername() == null || response.getPassword() == null) {
                 return response;
             }