Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 51236 invoked from network); 3 Apr 2009 18:57:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Apr 2009 18:57:51 -0000 Received: (qmail 16933 invoked by uid 500); 3 Apr 2009 18:57:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 16845 invoked by uid 500); 3 Apr 2009 18:57:51 -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 16836 invoked by uid 99); 3 Apr 2009 18:57:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2009 18:57:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2009 18:57:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5EA072388A04; Fri, 3 Apr 2009 18:57:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761759 - in /cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound: DispatchMDBInvoker.java InboundEndpoint.java MDBActivationWork.java MDBInvoker.java Date: Fri, 03 Apr 2009 18:57:30 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090403185730.5EA072388A04@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Apr 3 18:57:29 2009 New Revision: 761759 URL: http://svn.apache.org/viewvc?rev=761759&view=rev Log: [CXF-2145] JCA proxy concurrency issue patch from Seumas Soltysik and William Tam applied. Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java?rev=761759&r1=761758&r2=761759&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java Fri Apr 3 18:57:29 2009 @@ -22,6 +22,7 @@ import java.util.logging.Logger; import javax.resource.spi.endpoint.MessageEndpoint; +import javax.resource.spi.endpoint.MessageEndpointFactory; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.message.Exchange; @@ -45,23 +46,36 @@ /** * @param messageEndpoint */ - public DispatchMDBInvoker(MessageEndpoint messageEndpoint, String targetJndiName) { - super(messageEndpoint); + public DispatchMDBInvoker(MessageEndpointFactory factory, String targetJndiName) { + super(factory); this.targetJndiName = targetJndiName; } @Override public Object getServiceObject(Exchange context) { Object target = null; + MessageEndpoint ep = getMessageEndpoint(); + + if (ep == null) { + LOG.log(Level.SEVERE, "Failed to obtain MessageEndpoint"); + return null; + } + try { - target = ((DispatchMDBMessageListener)getMessageEndpoint()) + target = ((DispatchMDBMessageListener)ep) .lookupTargetObject(targetJndiName); } catch (Exception e) { LOG.log(Level.SEVERE, "Failed to obtain service object " + targetJndiName, e); return null; + } finally { + releaseEndpoint(ep); } return target; } + public void releaseServiceObject(final Exchange context, Object obj) { + + } + } Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java?rev=761759&r1=761758&r2=761759&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java Fri Apr 3 18:57:29 2009 @@ -83,10 +83,7 @@ * @throws Exception */ public void shutdown() throws Exception { - if (invoker != null) { - invoker.getMessageEndpoint().release(); - invoker = null; - } + invoker = null; if (server != null) { server.stop(); Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java?rev=761759&r1=761758&r2=761759&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java Fri Apr 3 18:57:29 2009 @@ -25,7 +25,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.resource.spi.UnavailableException; import javax.resource.spi.endpoint.MessageEndpoint; import javax.resource.spi.endpoint.MessageEndpointFactory; import javax.resource.spi.work.Work; @@ -52,12 +51,9 @@ public class MDBActivationWork implements Work { private static final Logger LOG = LogUtils.getL7dLogger(MDBActivationWork.class); - private static final int MAX_ATTEMPTS = 5; - private static final long RETRY_SLEEP = 5000; private MDBActivationSpec spec; private MessageEndpointFactory endpointFactory; - private boolean released; private Map endpoints; @@ -70,28 +66,31 @@ } public void release() { - released = true; + } /** * Performs the work */ public void run() { - // get message driven bean proxy - MessageEndpoint endpoint = getMesssageEndpoint(); - if (endpoint == null) { - // error has been logged. - return; + MDBInvoker invoker = createInvoker(); + MessageEndpoint mep = invoker.getMessageEndpoint(); + if (mep == null) { + return; } - - // get class loader - ClassLoader classLoader = endpoint.getClass().getClassLoader(); - ClassLoader savedClassLoader = Thread.currentThread().getContextClassLoader(); + + ClassLoader savedClassLoader = null; + try { + savedClassLoader = Thread.currentThread().getContextClassLoader(); + ClassLoader classLoader = mep.getClass().getClassLoader(); Thread.currentThread().setContextClassLoader(classLoader); - activate(endpoint, classLoader); + activate(invoker, classLoader); } finally { - Thread.currentThread().setContextClassLoader(savedClassLoader); + invoker.releaseEndpoint(mep); + if (savedClassLoader != null) { + Thread.currentThread().setContextClassLoader(savedClassLoader); + } } } @@ -99,7 +98,7 @@ * @param endpoint * @param classLoader */ - private void activate(MessageEndpoint endpoint, ClassLoader classLoader) { + private void activate(MDBInvoker invoker, ClassLoader classLoader) { Class serviceClass = null; if (spec.getServiceInterfaceClass() != null) { try { @@ -128,7 +127,6 @@ bus = BusFactory.getDefaultBus(); } - MDBInvoker invoker = createInvoker(endpoint); Server server = createServer(bus, serviceClass, invoker); if (server == null) { @@ -231,49 +229,15 @@ * @param endpoint * @return */ - private MDBInvoker createInvoker(MessageEndpoint endpoint) { + private MDBInvoker createInvoker() { MDBInvoker answer = null; if (spec instanceof DispatchMDBActivationSpec) { - answer = new DispatchMDBInvoker(endpoint, + answer = new DispatchMDBInvoker(endpointFactory, ((DispatchMDBActivationSpec)spec).getTargetBeanJndiName()); } else { - answer = new MDBInvoker(endpoint); + answer = new MDBInvoker(endpointFactory); } return answer; } - /** - * Invokes endpoint factory to create message endpoint (event driven bean). - * It will retry if the event driven bean is not yet available. - */ - private MessageEndpoint getMesssageEndpoint() { - MessageEndpoint answer = null; - for (int i = 0; i < MAX_ATTEMPTS; i++) { - - if (released) { - LOG.warning("CXF service activation has been stopped."); - return null; - } - - try { - answer = endpointFactory.createEndpoint(null); - break; - } catch (UnavailableException e) { - LOG.fine("Target endpoint activation in progress. Will retry."); - try { - Thread.sleep(RETRY_SLEEP); - } catch (InterruptedException e1) { - // ignore - } - } - } - - if (answer == null) { - LOG.severe("Failed to activate service endpoint " - + spec.getDisplayName() - + " due to unable to endpoint listener."); - } - - return answer; - } } Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java?rev=761759&r1=761758&r2=761759&view=diff ============================================================================== --- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java (original) +++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java Fri Apr 3 18:57:29 2009 @@ -18,8 +18,13 @@ */ package org.apache.cxf.jca.inbound; +import java.util.logging.Logger; + +import javax.resource.spi.UnavailableException; import javax.resource.spi.endpoint.MessageEndpoint; +import javax.resource.spi.endpoint.MessageEndpointFactory; +import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.message.Exchange; import org.apache.cxf.service.invoker.AbstractInvoker; @@ -35,26 +40,62 @@ * (SEI) class. */ public class MDBInvoker extends AbstractInvoker { - - private MessageEndpoint messageEndpoint; + private static final Logger LOG = LogUtils.getL7dLogger(MDBInvoker.class); + private static final int MAX_ATTEMPTS = 5; + private static final long RETRY_SLEEP = 2000; + + private final MessageEndpointFactory endpointFactory; /** * @param messageEndpoint */ - public MDBInvoker(MessageEndpoint messageEndpoint) { - this.messageEndpoint = messageEndpoint; + public MDBInvoker(MessageEndpointFactory factory) { + endpointFactory = factory; } /** * @return the messageEndpoint */ public MessageEndpoint getMessageEndpoint() { - return messageEndpoint; + return createMessageEndpoint(); + } + + protected void releaseEndpoint(MessageEndpoint mep) { + mep.release(); } @Override public Object getServiceObject(Exchange context) { - return messageEndpoint; + return getMessageEndpoint(); + } + + public void releaseServiceObject(final Exchange context, Object obj) { + if (obj instanceof MessageEndpoint) { + MessageEndpoint mep = (MessageEndpoint)obj; + releaseEndpoint(mep); + } } + /** + * Invokes endpoint factory to create message endpoint (event driven bean). + * It will retry if the event driven bean is not yet available. + */ + private MessageEndpoint createMessageEndpoint() { + MessageEndpoint ep = null; + for (int i = 0; i < MAX_ATTEMPTS; i++) { + try { + ep = endpointFactory.createEndpoint(null); + break; + } catch (UnavailableException e) { + LOG.fine("Target endpoint activation in progress. Will retry."); + try { + Thread.sleep(RETRY_SLEEP); + } catch (InterruptedException e1) { + // ignore + } + } + } + + return ep; + } }