svn commit: r1443654 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java

[cschneider]

Author: cschneider
Date: Thu Feb  7 18:50:01 2013
New Revision: 1443654

URL: http://svn.apache.org/r1443654
Log:
CXF-4815 Do not return auth info for basic and disgest auth as we already 
support it through the HttpConduit

Modified:
    
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java

Modified: 
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java?rev=1443654&r1=1443653&r2=1443654&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
 (original)
+++ 
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
 Thu Feb  7 18:50:01 2013
@@ -98,9 +98,7 @@ public class CXFAuthenticator extends Au
                 } else if (getRequestorType() == RequestorType.SERVER
                     && httpConduit.getAuthorization() != null) {
                     
-                    if (m.containsKey(PasswordAuthentication.class.getName())
-                        && ("basic".equals(getRequestingScheme())
-                            || "digest".equals(getRequestingScheme()))) {
+                    if ("basic".equals(getRequestingScheme()) || 
"digest".equals(getRequestingScheme())) {
                         return null;
                     }
                     
@@ -108,7 +106,6 @@ public class CXFAuthenticator extends Au
                     String pwd =  httpConduit.getAuthorization().getPassword();
                     if (un != null && pwd != null) {
                         auth = new PasswordAuthentication(un, 
pwd.toCharArray());
-                        m.put(PasswordAuthentication.class.getName(), 
Boolean.TRUE);
                     }
                 }
             }