Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/79625542 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/79625542 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/79625542 Branch: refs/heads/3.1.x-fixes Commit: 79625542170497e7075bca40c23227c1bc89c9d3 Parents: 6727419 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Mar 29 10:26:32 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Mar 29 10:26:32 2017 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/79625542/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java index 0a98835..ede683d 100644 --- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java +++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java @@ -338,9 +338,6 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message> imple } } } -<<<<<<< HEAD - -======= private X509Certificate[] getX509CertificatesForKeyName(Crypto sigCrypto, Message msg, KeyNameSecurityToken token) throws XMLSecurityException { @@ -360,8 +357,6 @@ public class XmlSecInInterceptor extends AbstractPhaseInterceptor<Message> imple return certs; } - ->>>>>>> 2ea81b5... CXF-7084 - Dynamically load signature validation keys using KeyName. protected void throwFault(String error, Exception ex) { LOG.warning(error); Response response = JAXRSUtils.toResponseBuilder(400).entity(error).build();
