Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 116EE200BCA for ; Mon, 21 Nov 2016 11:08:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 10EE9160AF9; Mon, 21 Nov 2016 10:08:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5BA49160AEC for ; Mon, 21 Nov 2016 11:08:17 +0100 (CET) Received: (qmail 28876 invoked by uid 500); 21 Nov 2016 10:08:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 28863 invoked by uid 99); 21 Nov 2016 10:08:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2016 10:08:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 394C1E0999; Mon, 21 Nov 2016 10:08:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <60c2959e69144aedaf49eaff31eb3155@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7135] Updating JMS ConnectionFactoryFeature to support InterceptorProvider Date: Mon, 21 Nov 2016 10:08:16 +0000 (UTC) archived-at: Mon, 21 Nov 2016 10:08:18 -0000 Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e04b405eb -> 9f5d47d90 [CXF-7135] Updating JMS ConnectionFactoryFeature to support InterceptorProvider Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9f5d47d9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9f5d47d9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9f5d47d9 Branch: refs/heads/3.0.x-fixes Commit: 9f5d47d905ff6bca5e60a0fb05e869cb32037dcc Parents: e04b405 Author: Sergey Beryozkin Authored: Mon Nov 21 10:02:19 2016 +0000 Committer: Sergey Beryozkin Committed: Mon Nov 21 10:08:01 2016 +0000 ---------------------------------------------------------------------- .../transport/jms/ConnectionFactoryFeature.java | 31 +++++++++++++------- 1 file changed, 21 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9f5d47d9/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ConnectionFactoryFeature.java ---------------------------------------------------------------------- diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ConnectionFactoryFeature.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ConnectionFactoryFeature.java index dca3e43..ee0dfaa 100644 --- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ConnectionFactoryFeature.java +++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/ConnectionFactoryFeature.java @@ -26,6 +26,7 @@ import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Server; import org.apache.cxf.feature.AbstractFeature; import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.interceptor.InterceptorProvider; import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; @@ -47,17 +48,14 @@ public class ConnectionFactoryFeature extends AbstractFeature { @Override public void initialize(Client client, Bus bus) { - client.getEndpoint().getOutInterceptors().add(new AbstractPhaseInterceptor(Phase.PREPARE_SEND) { - public void handleMessage(Message message) throws Fault { - Conduit conduit = message.getExchange().getConduit(message); - if (conduit instanceof JMSConduit) { - JMSConduit jmsConduit = (JMSConduit)conduit; - jmsConduit.getJmsConfig().setConnectionFactory(connectionFactory); - } - } - }); + client.getEndpoint().getOutInterceptors().add(new JMSConduitConfigOutInterceptor()); super.initialize(client, bus); } + @Override + public void initialize(InterceptorProvider provider, Bus bus) { + provider.getOutInterceptors().add(new JMSConduitConfigOutInterceptor()); + super.initialize(provider, bus); + } @Override public void initialize(Server server, Bus bus) { @@ -68,5 +66,18 @@ public class ConnectionFactoryFeature extends AbstractFeature { } super.initialize(server, bus); } - + private class JMSConduitConfigOutInterceptor extends AbstractPhaseInterceptor { + JMSConduitConfigOutInterceptor() { + super(Phase.PREPARE_SEND); + } + + @Override + public void handleMessage(Message message) throws Fault { + Conduit conduit = message.getExchange().getConduit(message); + if (conduit instanceof JMSConduit) { + JMSConduit jmsConduit = (JMSConduit)conduit; + jmsConduit.getJmsConfig().setConnectionFactory(connectionFactory); + } + } + } }