cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Thu, 24 Sep 2015 10:31:53 GMT
Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: d9396a052e296fa982bc77bd4dff07913e3a18df
Parents: 1db85cc
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Sep 24 11:26:00 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Sep 24 11:31:44 2015 +0100

----------------------------------------------------------------------
 .../apache/cxf/ws/security/trust/STSUtils.java  | 21 ++++----------------
 1 file changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d9396a05/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
index 0de15aa..3b0b9f9 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSUtils.java
@@ -111,18 +111,14 @@ public final class STSUtils {
         }
         
         boolean preferWSMex = 
-            SecurityUtils.getSecurityPropertyBoolean(SecurityConstants.PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
-                                                     message, 
-                                                     false);
+            MessageUtils.getContextualBoolean(message,
+                                              SecurityConstants.PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
+                                              false);
         
         // Find out if we have an EPR to get the STS Address (possibly via WS-MEX)
-<<<<<<< HEAD
-        if (itok != null && itok.getIssuer() != null && message != null)
{
-=======
         // Only parse the EPR if we really have to
-        if (issuer != null
+        if (itok != null && itok.getIssuer() != null && message != null
             && (preferWSMex || client.getLocation() == null && client.getWsdlLocation()
== null)) {
->>>>>>> 9dc7a39... [CXF-6600] - Sudden repeating NPE on token request
by STSClient
             EndpointReferenceType epr = null;
             try {
                 epr = VersionTransformer.parseEndpointReference(itok.getIssuer());
@@ -130,16 +126,7 @@ public final class STSUtils {
                 throw new IllegalArgumentException(e);
             }
             
-<<<<<<< HEAD
-            String mexLocation = findMEXLocation(epr);
-            // Configure via WS-MEX
-            if (mexLocation != null
-                && MessageUtils.getContextualBoolean(message, 
-                                                     SecurityConstants.PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
-                                                     false)) {
-=======
             if (preferWSMex && findMEXLocation(epr) != null) {
->>>>>>> 9dc7a39... [CXF-6600] - Sudden repeating NPE on token request
by STSClient
                 // WS-MEX call. So now either get the WS-MEX specific STSClient or else create
one
                 STSClient wsMexClient = (STSClient)message
                     .getContextualProperty(SecurityConstants.STS_CLIENT + ".wsmex");


Mime
View raw message