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 merge
Date Thu, 20 Apr 2017 09:27:29 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: b9b356546069166f26ee9f61da85f67639874273
Parents: 6ccde34
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Apr 20 10:27:19 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Apr 20 10:27:19 2017 +0100

----------------------------------------------------------------------
 .../ws/security/wss4j/WSS4JInInterceptor.java   | 45 --------------------
 1 file changed, 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b9b35654/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
index 56ccf12..fde6e8c 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
@@ -281,10 +281,6 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
                 }
 
                 checkActions(msg, reqData, wsResult.getResults(), actions, SAAJUtils.getBody(doc));
-<<<<<<< HEAD
-=======
-
->>>>>>> 0b7b183... NPE fix
                 doResults(
                     msg, actor, 
                     SAAJUtils.getHeader(doc),
@@ -334,48 +330,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor {
             reqData = null;
         }
     }
-<<<<<<< HEAD
-    
-=======
-    private void importNewDomToSAAJ(SOAPMessage doc, Element elem, Node originalNode) throws
SOAPException {
-        if (DOMUtils.isJava9SAAJ()
-            && originalNode != null && !originalNode.isEqualNode(elem)) {
-            //ensure the new decrypted dom element could be imported into the SAAJ
-            Node node = null;
-            Document document = null;
-            Element body = SAAJUtils.getBody(doc);
-            if (body != null) {
-                document = body.getOwnerDocument();
-            }
-            if (elem != null && elem.getOwnerDocument() != null
-                && elem.getOwnerDocument().getDocumentElement() != null) {
-                node = elem.getOwnerDocument().
-                    getDocumentElement().getFirstChild().getNextSibling().getFirstChild();
-            }
-            if (document != null && node != null) {
-                Node newNode = null;
-                try {
-                    newNode = document.importNode(node, true);
-                    if (newNode != null) {
-                        try {
-                            Method method = newNode.getClass().getMethod("getDomElement");
-                            newNode = (Element)method.invoke(newNode);
-                        } catch (java.lang.NoSuchMethodException ex) {
-                            // do nothing;
-                        }
-                    }
-                    elem.getOwnerDocument().getDocumentElement().getFirstChild().
-                        getNextSibling().replaceChild(newNode, node);
-                } catch (Exception ex) {
-                    //just to the best try
-                }
-
-            }
-
-        }
-    }
 
->>>>>>> 0b7b183... NPE fix
     private void configureAudienceRestriction(SoapMessage msg, RequestData reqData) {
         // Add Audience Restrictions for SAML
         boolean enableAudienceRestriction = 


Mime
View raw message