Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 83620 invoked from network); 7 Sep 2009 11:17:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Sep 2009 11:17:01 -0000 Received: (qmail 55549 invoked by uid 500); 7 Sep 2009 11:17:01 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 55497 invoked by uid 500); 7 Sep 2009 11:17:01 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 55488 invoked by uid 99); 7 Sep 2009 11:17:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2009 11:17:01 +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; Mon, 07 Sep 2009 11:16:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2859E2388866; Mon, 7 Sep 2009 11:16:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r812082 - in /tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms: context/JMSBindingContext.java provider/JMSResourceFactory.java provider/JMSResourceFactoryImpl.java Date: Mon, 07 Sep 2009 11:16:39 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090907111639.2859E2388866@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Mon Sep 7 11:16:38 2009 New Revision: 812082 URL: http://svn.apache.org/viewvc?rev=812082&view=rev Log: TUSCANY-3255: Apply patch from Greg Dritschler to Consolidate JMS session management in JMSResourceFactory Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java?rev=812082&r1=812081&r2=812082&view=diff ============================================================================== --- tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java (original) +++ tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java Mon Sep 7 11:16:38 2009 @@ -66,7 +66,7 @@ public synchronized void closeJmsSession() { if (jmsSession != null) { try { - jmsSession.close(); + getJmsResourceFactory().closeSession(jmsSession); } catch (Exception e) { throw new JMSBindingException(e); } finally { @@ -89,7 +89,7 @@ public synchronized void closeJmsResponseSession() { if (jmsResponseSession != null) { try { - jmsResponseSession.close(); + getJmsResourceFactory().closeResponseSession(jmsResponseSession); } catch (Exception e) { throw new JMSBindingException(e); } finally { Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java?rev=812082&r1=812081&r2=812082&view=diff ============================================================================== --- tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java (original) +++ tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java Mon Sep 7 11:16:38 2009 @@ -43,6 +43,8 @@ */ public abstract Session createSession() throws JMSException, NamingException; + public abstract void closeSession(Session session) throws JMSException; + /* * (non-Javadoc) * @@ -80,6 +82,7 @@ */ public abstract Session createResponseSession() throws JMSException, NamingException; + public abstract void closeResponseSession(Session session) throws JMSException; public abstract void closeResponseConnection() throws JMSException; Modified: tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java?rev=812082&r1=812081&r2=812082&view=diff ============================================================================== --- tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java (original) +++ tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java Mon Sep 7 11:16:38 2009 @@ -89,6 +89,15 @@ /* * (non-Javadoc) * + * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#closeSession(javax.jms.Session) + */ + public void closeSession(Session session) throws JMSException { + session.close(); + } + + /* + * (non-Javadoc) + * * @see org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory#startConnection() */ public void startConnection() throws JMSException, NamingException { @@ -229,6 +238,10 @@ return getResponseConnection().createSession(false, Session.AUTO_ACKNOWLEDGE); } + public void closeResponseSession(Session session) throws JMSException { + session.close(); + } + public Connection getResponseConnection() throws NamingException, JMSException { if (responseConnection == null) { if (responseConnectionFactoryName != null) {