cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/3] cxf git commit: Fixing security merge
Date Fri, 02 Dec 2016 14:56:42 GMT
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 <coheigea@apache.org>
Authored: Fri Dec 2 14:11:03 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
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;
     }


Mime
View raw message