Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6271AEF95 for ; Thu, 7 Feb 2013 19:03:06 +0000 (UTC) Received: (qmail 53767 invoked by uid 500); 7 Feb 2013 19:03:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 53718 invoked by uid 500); 7 Feb 2013 19:03:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 53711 invoked by uid 99); 7 Feb 2013 19:03:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 19:03:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2013 19:03:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 481532388978; Thu, 7 Feb 2013 19:02:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1443665 - in /cxf/branches/2.7.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java Date: Thu, 07 Feb 2013 19:02:44 -0000 To: commits@cxf.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130207190244.481532388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Thu Feb 7 19:02:43 2013 New Revision: 1443665 URL: http://svn.apache.org/r1443665 Log: CXF-4815 Do not return auth info for basic and disgest auth as we already support it through the HttpConduit Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1443654 Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java?rev=1443665&r1=1443664&r2=1443665&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java (original) +++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java Thu Feb 7 19:02:43 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); } } }