cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1390609 - /cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Date Wed, 26 Sep 2012 17:07:07 GMT
Author: dkulp
Date: Wed Sep 26 17:07:06 2012
New Revision: 1390609

URL: http://svn.apache.org/viewvc?rev=1390609&view=rev
Log:
Merged revisions 1390605 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1390605 | dkulp | 2012-09-26 13:05:32 -0400 (Wed, 26 Sep 2012) | 10 lines

  Merged revisions 1390602 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1390602 | dkulp | 2012-09-26 13:03:22 -0400 (Wed, 26 Sep 2012) | 2 lines

    If we have a principal, even for basic auth, record it.

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1390609&r1=1390608&r2=1390609&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Wed Sep 26 17:07:06 2012
@@ -159,7 +159,8 @@ public abstract class AbstractHTTPDestin
                 // Below line for systems that blank out password after authentication;
                 // see CXF-1495 for more info
                 String password = (authInfo.length > 1) ? authInfo[1] : "";
-                AuthorizationPolicy policy = new AuthorizationPolicy();
+                AuthorizationPolicy policy = pp == null 
+                    ? new AuthorizationPolicy() : new PrincipalAuthorizationPolicy(pp);
                 policy.setUserName(username);
                 policy.setPassword(password);
                 policy.setAuthorizationType(authType);



Mime
View raw message