Return-Path: Delivered-To: apmail-incubator-uima-commits-archive@locus.apache.org Received: (qmail 1305 invoked from network); 29 Oct 2008 15:53:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Oct 2008 15:53:00 -0000 Received: (qmail 88571 invoked by uid 500); 29 Oct 2008 15:53:05 -0000 Delivered-To: apmail-incubator-uima-commits-archive@incubator.apache.org Received: (qmail 88548 invoked by uid 500); 29 Oct 2008 15:53:05 -0000 Mailing-List: contact uima-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: uima-dev@incubator.apache.org Delivered-To: mailing list uima-commits@incubator.apache.org Received: (qmail 88539 invoked by uid 99); 29 Oct 2008 15:53:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Oct 2008 08:53:05 -0700 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; Wed, 29 Oct 2008 15:51:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 31CF0238895D; Wed, 29 Oct 2008 08:52:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r708925 - in /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq: JmsInputChannel.java UimaDefaultMessageListenerContainer.java Date: Wed, 29 Oct 2008 15:52:28 -0000 To: uima-commits@incubator.apache.org From: eae@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081029155229.31CF0238895D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eae Date: Wed Oct 29 08:52:26 2008 New Revision: 708925 URL: http://svn.apache.org/viewvc?rev=708925&view=rev Log: UIMA-1191 apply core and activemq patch files Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java?rev=708925&r1=708924&r2=708925&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsInputChannel.java Wed Oct 29 08:52:26 2008 @@ -869,17 +869,25 @@ } return null; } - public void destroyListener( String anEndpointName, String aDelegateKey ) { + public synchronized void destroyListener( String anEndpointName, String aDelegateKey ) { final UimaDefaultMessageListenerContainer mListener = getListenerForEndpoint(anEndpointName); if ( mListener == null ) { System.out.println("--- Listener For Endpoint: "+aDelegateKey+" Not Found"); return; } + if ( !mListener.isRunning() ) { + return; // Already Stopped + } try { -// if ( messageListener.getDestination().toString().equals( anEndpointName)) { + if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO) && mListener.getDestination() != null) { + UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), + "destroyListener", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_stop_listener__INFO", + new Object[] { mListener.getDestination().toString() }); + } System.out.println("++++ Stopping Listener ..."); + mListener.closeConnection(); mListener.stop(); System.out.println("++++ Destroying Listener ..."); new Thread() { @@ -888,7 +896,12 @@ } }; while( mListener.isRunning()); - System.out.println("++++ Listener on Queue:"+anEndpointName+" Has Been Stopped..."); + System.out.println("Thread:"+Thread.currentThread().getId()+"++++ Listener on Queue:"+anEndpointName+" Has Been Stopped..."); + if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO) && mListener.getDestination() != null) { + UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), + "destroyListener", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_stopped_listener_INFO", + new Object[] {controller.getComponentName(), mListener.getDestination().toString() }); + } Endpoint endpoint = ((AggregateAnalysisEngineController)getController()).lookUpEndpoint(aDelegateKey, false); endpoint.setStatus(Endpoint.FAILED); if ( mListener.getConnectionFactory() != null) { @@ -896,7 +909,6 @@ if ( !failedListenerMap.containsKey(aDelegateKey )) { failedListenerMap.put( aDelegateKey, mListener); listenerContainerList.remove(mListener); - System.out.println("++++ Saving Connection Factory"); } } } Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java?rev=708925&r1=708924&r2=708925&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaDefaultMessageListenerContainer.java Wed Oct 29 08:52:26 2008 @@ -369,6 +369,7 @@ try { setRecoveryInterval(0); + setAcceptMessagesWhileStopping(false); setAutoStartup(false); getSharedConnection().close(); }