Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b31251da Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b31251da Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b31251da Branch: refs/heads/3.1.x-fixes Commit: b31251dae4cc32835669b3644e485b4773d3550b Parents: 83ec896 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Apr 19 15:34:29 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Apr 19 15:34:29 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b31251da/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java index b4abf6b..7a517d3 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java @@ -332,13 +332,10 @@ public class XmlSecOutInterceptor extends AbstractPhaseInterceptor<Message> { if (sigProps.getSignatureC14nTransform() != null) { transform = sigProps.getSignatureC14nTransform(); } -<<<<<<< HEAD -======= if (sigProps.getSignatureLocation() != null) { properties.setSignaturePosition(sigProps.getSignatureLocation()); } ->>>>>>> be99c53... CXF-7340 Add an option to specify the location of the signature element if (elementsToSign == null || elementsToSign.isEmpty()) { LOG.fine("No Elements to sign are specified, so the entire request is signed");
