You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/09/26 19:10:37 UTC
svn commit: r1390613 -
/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Author: dkulp
Date: Wed Sep 26 17:10:37 2012
New Revision: 1390613
URL: http://svn.apache.org/viewvc?rev=1390613&view=rev
Log:
Merged revisions 1390608 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1390608 | dkulp | 2012-09-26 13:07:03 -0400 (Wed, 26 Sep 2012) | 18 lines
Merged revisions 1390604 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1390604 | dkulp | 2012-09-26 13:05:28 -0400 (Wed, 26 Sep 2012) | 10 lines
Merged revisions 1390600 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1390600 | dkulp | 2012-09-26 12:56:17 -0400 (Wed, 26 Sep 2012) | 2 lines
If the Basic auth stuff is not valid, but a principal was provided, use it.
........
........
........
Modified:
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1390613&r1=1390612&r2=1390613&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Wed Sep 26 17:10:37 2012
@@ -165,9 +165,10 @@ public abstract class AbstractHTTPDestin
policy.setAuthorizationType(authType);
return policy;
} catch (Base64Exception ex) {
- // Invalid authentication => treat as not authenticated
+ // Invalid authentication => treat as not authenticated or use the Principal
}
- } else if (pp != null) {
+ }
+ if (pp != null) {
AuthorizationPolicy policy = new PrincipalAuthorizationPolicy(pp);
policy.setUserName(pp.getName());
policy.setAuthorization(credentials);