cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: Some minor modifications to the STSClient
Date Fri, 21 Feb 2014 14:48:45 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 0bbd3da67 -> 642f2534d


Some minor modifications to the STSClient


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

Branch: refs/heads/master
Commit: 642f2534d6dba97c2d1fb3fe274f900351b456c3
Parents: 0bbd3da
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Feb 21 14:48:20 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Feb 21 14:48:20 2014 +0000

----------------------------------------------------------------------
 .../cxf/ws/security/trust/AbstractSTSClient.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/642f2534/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 05d3cec..89d96b3 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -278,14 +278,11 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
 
     public void setTrust(Trust10 trust) {
         if (trust != null) {
-            namespace = STSUtils.WST_NS_05_02;
-            requiresEntropy = trust.isRequireClientEntropy();
-        }
-    }
-
-    public void setTrust(Trust13 trust) {
-        if (trust != null) {
-            namespace = STSUtils.WST_NS_05_12;
+            if (trust instanceof Trust13) {
+                namespace = STSUtils.WST_NS_05_12;
+            } else {
+                namespace = STSUtils.WST_NS_05_02;
+            }
             requiresEntropy = trust.isRequireClientEntropy();
         }
     }
@@ -1666,4 +1663,8 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
     public void setUseKeyCertificate(X509Certificate useKeyCertificate) {
         this.useKeyCertificate = useKeyCertificate;
     }
+
+    public void setNamespace(String namespace) {
+        this.namespace = namespace;
+    }
 }


Mime
View raw message