Fixing security merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/49da1446 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/49da1446 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/49da1446 Branch: refs/heads/3.1.x-fixes Commit: 49da1446b20bbea0fa35ee684fe21382cf2b2333 Parents: 31bdc01 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Dec 2 14:11:03 2016 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Dec 2 14:11:03 2016 +0000 ---------------------------------------------------------------------- .../security/wss4j/policyhandlers/AbstractBindingBuilder.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/49da1446/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index d15c3b6..f187e9c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -613,11 +613,7 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle } protected Element cloneElement(Element el) { -<<<<<<< HEAD - if (!secHeader.getSecurityHeader().getOwnerDocument().equals(el.getOwnerDocument())) { - return (Element)secHeader.getSecurityHeader().getOwnerDocument().importNode(el, true); -======= - Document doc = secHeader.getSecurityHeaderElement().getOwnerDocument(); + Document doc = secHeader.getSecurityHeader().getOwnerDocument(); if (!doc.equals(el.getOwnerDocument())) { XMLStreamReader reader = StaxUtils.createXMLStreamReader(el); @@ -629,7 +625,6 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle } catch (XMLStreamException ex) { LOG.log(Level.FINE, "Error cloning security element", ex); } ->>>>>>> 66e97c7... CXF-6604 - Sporadic ClassCastException in AsymmetricBindingHandler#doSignBeforeEncrypt } return el; }