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 Tue, 04 Apr 2017 11:06:50 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/9ee4e026
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9ee4e026
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9ee4e026

Branch: refs/heads/3.1.x-fixes
Commit: 9ee4e026f3a82cbec5ad9f0efca136a216d84956
Parents: d370505
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Apr 4 12:06:41 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Apr 4 12:06:41 2017 +0100

----------------------------------------------------------------------
 .../DefaultWSS4JSecurityContextCreator.java     | 22 --------------------
 1 file changed, 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9ee4e026/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java
index 2cbebd7..75fbc33 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/DefaultWSS4JSecurityContextCreator.java
@@ -94,38 +94,17 @@ public class DefaultWSS4JSecurityContextCreator implements WSS4JSecurityContextC
             List<WSSecurityEngineResult> foundResults = actionResults.get(resultPriority);
             if (foundResults != null && !foundResults.isEmpty()) {
                 for (WSSecurityEngineResult result : foundResults) {
-<<<<<<< HEAD
-                    final Object binarySecurity = result.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-                    PublicKey publickey = 
-                        (PublicKey)result.get(WSSecurityEngineResult.TAG_PUBLIC_KEY);
-                    X509Certificate cert = 
-                        (X509Certificate)result.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
-                    
-                    if ((resultPriority == WSConstants.BST && !(binarySecurity instanceof
KerberosSecurity))
-                        || (resultPriority == WSConstants.SIGN && publickey == null
&& cert == null)) {
-                        continue;
-                    }
-                    SecurityContext context = createSecurityContext(msg, useJAASSubject,
result);
-                    if (context != null) {
-                        msg.put(SecurityContext.class, context);
-                        return;
-=======
-
                     if (!skipResult(resultPriority, result)) {
                         SecurityContext context = createSecurityContext(msg, useJAASSubject,
result);
                         if (context != null) {
                             msg.put(SecurityContext.class, context);
                             return;
                         }
->>>>>>> d1b8ff6... CXF-7314 - Custom BinarySecurityTokens are not used
to set up the security context
                     }
                 }
             }
         }
     }
-<<<<<<< HEAD
-    
-=======
 
     private boolean skipResult(Integer resultPriority, WSSecurityEngineResult result) {
         Object binarySecurity = result.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
@@ -139,7 +118,6 @@ public class DefaultWSS4JSecurityContextCreator implements WSS4JSecurityContextC
             || resultPriority == WSConstants.SIGN && publickey == null &&
cert == null;
     }
 
->>>>>>> d1b8ff6... CXF-7314 - Custom BinarySecurityTokens are not used
to set up the security context
     protected SecurityContext createSecurityContext(
         SoapMessage msg, boolean useJAASSubject, WSSecurityEngineResult wsResult
     ) {


Mime
View raw message