Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E54F9200BE0 for ; Fri, 2 Dec 2016 15:56:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E4477160B16; Fri, 2 Dec 2016 14:56:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3F898160B24 for ; Fri, 2 Dec 2016 15:56:42 +0100 (CET) Received: (qmail 63281 invoked by uid 500); 2 Dec 2016 14:56:41 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 63226 invoked by uid 99); 2 Dec 2016 14:56:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2016 14:56:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 22DE1DFCC4; Fri, 2 Dec 2016 14:56:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Fri, 02 Dec 2016 14:56:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cxf git commit: Fixing security merge archived-at: Fri, 02 Dec 2016 14:56:43 -0000 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/3f2c0530 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3f2c0530 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3f2c0530 Branch: refs/heads/3.0.x-fixes Commit: 3f2c0530d9050793c29ae6b40254f582db10dbae Parents: aef4429 Author: Colm O hEigeartaigh Authored: Fri Dec 2 14:11:03 2016 +0000 Committer: Colm O hEigeartaigh Committed: Fri Dec 2 14:56: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/3f2c0530/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 49ca4bd..47df4c8 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 @@ -607,11 +607,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); @@ -623,7 +619,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; }