Changeset 6365 in josm for trunk/src/org/openstreetmap/josm/io/auth

Timestamp:

2013-11-05T01:53:15+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - fix of recent violations

File:

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

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

@@ -11 +11 @@
 /**
  * This is the default authenticator used in JOSM. It delegates lookup of credentials
- * for the OSM API and an optional proxy server to the currently configured
- * {@link CredentialsManager}.
- *
+ * for the OSM API and an optional proxy server to the currently configured {@link CredentialsManager}.
+ * @since 2641
  */
 public final class DefaultAuthenticator extends Authenticator {
     private static DefaultAuthenticator instance;
 
+    /**
+     * Returns the unique instance
+     * @return The unique instance
+     */
     public static DefaultAuthenticator getInstance() {
         return instance;
     }
 
+    /**
+     * Creates the unique instance
+     */
     public static void createInstance() {
         instance = new DefaultAuthenticator();
@@ -33 +39 @@
 
     /**
-     * Called by the Java http stack when either the OSM API server or a proxy requires
-     * authentication.
-     *
+     * Called by the Java HTTP stack when either the OSM API server or a proxy requires authentication.
      */
-    @Override protected PasswordAuthentication getPasswordAuthentication() {
+    @Override
+    protected PasswordAuthentication getPasswordAuthentication() {
         if (!enabled)
             return null;
         try {
-            if (getRequestorType().equals(Authenticator.RequestorType.SERVER)) {
+            if (getRequestorType().equals(Authenticator.RequestorType.SERVER) && OsmApi.isUsingOAuth()) {
                 // if we are working with OAuth we don't prompt for a password
-                if (OsmApi.isUsingOAuth())
-                    return null;
+                return null;
             }
             boolean tried = credentialsTried.get(getRequestorType()) != null;