cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: [CXF-6233] - STS client only sends AppliesTo on first RST call
Date Mon, 02 Feb 2015 17:13:55 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d565a483e -> 6339b4e9f


[CXF-6233] - STS client only sends AppliesTo on first RST call


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6339b4e9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6339b4e9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6339b4e9

Branch: refs/heads/3.0.x-fixes
Commit: 6339b4e9fa011680be2c22385e928b63493b838e
Parents: d565a48
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Feb 2 17:12:04 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Feb 2 17:13:50 2015 +0000

----------------------------------------------------------------------
 .../interceptors/IssuedTokenInterceptorProvider.java    | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6339b4e9/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
index 5b63621..20249be 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
@@ -440,7 +440,7 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
                 
                     client.setMessage(message);
 
-                    if (maps != null) {
+                    if (maps != null && maps.getNamespaceURI() != null) {
                         client.setAddressingNamespace(maps.getNamespaceURI());
                     }
                     
@@ -473,11 +473,6 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
                     } else {
                         throw new Fault(ex);
                     }
-                } finally {
-                    client.setTrust((Trust10)null);
-                    client.setTrust((Trust13)null);
-                    client.setTemplate(null);
-                    client.setAddressingNamespace(null);
                 }
             }
         }
@@ -537,11 +532,6 @@ public class IssuedTokenInterceptorProvider extends AbstractPolicyInterceptorPro
                     throw e;
                 } catch (Exception e) {
                     throw new Fault(e);
-                } finally {
-                    client.setTrust((Trust10)null);
-                    client.setTrust((Trust13)null);
-                    client.setTemplate(null);
-                    client.setAddressingNamespace(null);
                 }
             }
         }


Mime
View raw message