Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13fe678a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13fe678a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13fe678a Branch: refs/heads/3.0.x-fixes Commit: 13fe678a4b32c590d7e701833cb2452c8eb88cdf Parents: 81b9043 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jun 18 15:23:39 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jun 18 15:23:39 2015 +0100 ---------------------------------------------------------------------- .../wss4j/policyhandlers/SymmetricBindingHandler.java | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/13fe678a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java index 717480e..cb4e27f 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java @@ -482,17 +482,9 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { addDerivedKeyElement(encrDKTokenElem); Element refList = dkEncr.encryptForExternalRef(null, encrParts); -<<<<<<< HEAD - if (atEnd) { - this.insertBeforeBottomUp(refList); - } else { - this.addDerivedKeyElement(refList); - } -======= List<Element> attachments = dkEncr.getAttachmentEncryptedDataElements(); addAttachmentsForEncryption(atEnd, refList, attachments); ->>>>>>> e9e4d0b... [CXF-6464] - Minor refactor of applied patch. This closes #77 return dkEncr; } catch (Exception e) { LOG.log(Level.FINE, e.getMessage(), e);
