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 backmerge
Date Wed, 24 Jun 2015 16:07:06 GMT
Fixing backmerge


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

Branch: refs/heads/2.7.x-fixes
Commit: 4d453da4553accfa64ad637bd4572ef0f8ef41db
Parents: 19f0b50
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Jun 24 17:06:02 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Jun 24 17:06:02 2015 +0100

----------------------------------------------------------------------
 .../wss4j/policyhandlers/AsymmetricBindingHandler.java        | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4d453da4/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 9f582c0..087b869 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -143,7 +143,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
             }
             addSupportingTokens(sigs);
             
-            sigs.addAll(this.getSignedParts(null));
+            sigs.addAll(this.getSignedParts());
             
             if (isRequestor() && initiatorWrapper != null) {
                 doSignature(initiatorWrapper, sigs, attached);
@@ -504,12 +504,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder
{
             assertUnusedTokens(abinding.getRecipientSignatureToken());
         }
         
-<<<<<<< HEAD
         Token sigToken = wrapper.getToken();
-        sigParts.addAll(this.getSignedParts());
-=======
-        AbstractToken sigToken = wrapper.getToken();
->>>>>>> 273351c... [CXF-6473] - Double signatures while using AsymmetricBindingHandle
         if (sigParts.isEmpty()) {
             // Add the BST to the security header if required
             if (!attached && includeToken(sigToken.getInclusion())) {


Mime
View raw message