[2/3] cxf git commit: Minor change
Minor change Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/47839c64 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47839c64 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47839c64 Branch: refs/heads/3.1.x-fixes Commit: 47839c649a92a4e372eee313e5d53ec5c91df334 Parents: c5ad99e Author: Colm O hEigeartaigh Authored: Tue Feb 16 11:58:37 2016 + Committer: Colm O hEigeartaigh Committed: Tue Feb 16 13:54:52 2016 + -- .../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/47839c64/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 020b4ca..d996711 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 @@ -294,13 +294,13 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { doResults(msg, actor, SAAJUtils.getHeader(doc), SAAJUtils.getBody(doc), - wsResult); + wsResult, utWithCallbacks); } else { checkActions(msg, reqData, wsResult.getResults(), actions, SAAJUtils.getBody(doc)); doResults(msg, actor, SAAJUtils.getHeader(doc), SAAJUtils.getBody(doc), - wsResult); + wsResult, utWithCallbacks); } } advanceBody(msg, SAAJUtils.getBody(doc)); @@ -469,17 +469,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { String actor, Element soapHeader, Element soapBody, -WSHandlerResult wsResult -) throws SOAPException, XMLStreamException, WSSecurityException { -doResults(msg, actor, soapHeader, soapBody, wsResult, false); -} - -protected void doResults( -SoapMessage msg, -String actor, -Element soapHeader, -Element soapBody, -WSHandlerResult wsResult, +WSHandlerResult wsResult, boolean utWithCallbacks ) throws SOAPException, XMLStreamException, WSSecurityException {
[2/3] cxf git commit: Minor change
Minor change Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/864d3f30 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/864d3f30 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/864d3f30 Branch: refs/heads/master Commit: 864d3f3070eeea5d717caef381cd91f310195b30 Parents: a9db299 Author: Colm O hEigeartaigh Authored: Tue Feb 16 11:58:37 2016 + Committer: Colm O hEigeartaigh Committed: Tue Feb 16 11:58:37 2016 + -- .../cxf/ws/security/wss4j/WSS4JInInterceptor.java | 16 +++- 1 file changed, 3 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/864d3f30/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 020b4ca..d996711 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 @@ -294,13 +294,13 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { doResults(msg, actor, SAAJUtils.getHeader(doc), SAAJUtils.getBody(doc), - wsResult); + wsResult, utWithCallbacks); } else { checkActions(msg, reqData, wsResult.getResults(), actions, SAAJUtils.getBody(doc)); doResults(msg, actor, SAAJUtils.getHeader(doc), SAAJUtils.getBody(doc), - wsResult); + wsResult, utWithCallbacks); } } advanceBody(msg, SAAJUtils.getBody(doc)); @@ -469,17 +469,7 @@ public class WSS4JInInterceptor extends AbstractWSS4JInterceptor { String actor, Element soapHeader, Element soapBody, -WSHandlerResult wsResult -) throws SOAPException, XMLStreamException, WSSecurityException { -doResults(msg, actor, soapHeader, soapBody, wsResult, false); -} - -protected void doResults( -SoapMessage msg, -String actor, -Element soapHeader, -Element soapBody, -WSHandlerResult wsResult, +WSHandlerResult wsResult, boolean utWithCallbacks ) throws SOAPException, XMLStreamException, WSSecurityException {