Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 16835 invoked from network); 9 Apr 2008 10:24:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Apr 2008 10:24:35 -0000 Received: (qmail 53460 invoked by uid 500); 9 Apr 2008 10:24:31 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 53411 invoked by uid 500); 9 Apr 2008 10:24:31 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 53371 invoked by uid 99); 9 Apr 2008 10:24:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2008 03:24:30 -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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2008 10:23:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 865901A9838; Wed, 9 Apr 2008 03:24:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r646258 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java Date: Wed, 09 Apr 2008 10:24:03 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080409102407.865901A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Wed Apr 9 03:23:59 2008 New Revision: 646258 URL: http://svn.apache.org/viewvc?rev=646258&view=rev Log: Fix for https://issues.apache.org/activemq/browse/AMQ-1578 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java?rev=646258&r1=646257&r2=646258&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java Wed Apr 9 03:23:59 2008 @@ -52,6 +52,7 @@ private int maximumActive = 500; private int maxConnections = 1; private TransactionManager transactionManager; + private int idleTimeout = 30 * 1000; public PooledConnectionFactory() { this(new ActiveMQConnectionFactory()); @@ -114,7 +115,9 @@ } protected ConnectionPool createConnectionPool(ActiveMQConnection connection) { - return new ConnectionPool(connection, getPoolFactory(), transactionManager); + ConnectionPool result = new ConnectionPool(connection, getPoolFactory(), transactionManager); + result.setIdleTimeout(getIdleTimeout()); + return result; } protected ActiveMQConnection createConnection(ConnectionKey key) throws JMSException { @@ -190,5 +193,13 @@ protected ObjectPoolFactory createPoolFactory() { return new GenericObjectPoolFactory(null, maximumActive); + } + + public int getIdleTimeout() { + return idleTimeout; + } + + public void setIdleTimeout(int idleTimeout) { + this.idleTimeout = idleTimeout; } }