Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 45633 invoked from network); 14 Jan 2011 00:00:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Jan 2011 00:00:24 -0000 Received: (qmail 44419 invoked by uid 500); 14 Jan 2011 00:00:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 44382 invoked by uid 500); 14 Jan 2011 00:00:22 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 44375 invoked by uid 99); 14 Jan 2011 00:00:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jan 2011 00:00:22 +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, 14 Jan 2011 00:00:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02D6123888E7; Thu, 13 Jan 2011 23:59:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1058806 - in /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2: ./ geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ Date: Thu, 13 Jan 2011 23:59:42 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110113235943.02D6123888E7@eris.apache.org> Author: djencks Date: Thu Jan 13 23:59:42 2011 New Revision: 1058806 URL: http://svn.apache.org/viewvc?rev=1058806&view=rev Log: GERONIMO-5742 be sure to send mci's back to the right pool. Thanks to Florent Guillaume Added: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/MultiPoolMinSizeTest.java - copied unchanged from r1058805, geronimo/components/txmanager/trunk/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/MultiPoolMinSizeTest.java Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/ (props changed) geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ (props changed) geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java Propchange: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 13 23:59:42 2011 @@ -1,2 +1,3 @@ /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1:981270 -/geronimo/components/txmanager/trunk:900557,911974,912058,912297,912468,939929,1028958,1058794 +/geronimo/components/txmanager/trunk:900557,911974,912058,912297,912468,939929,1028958,1058794,1058805 +/geronimo/sandbox/djencks/txmanager:1058803 Propchange: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 13 23:59:42 2011 @@ -1,3 +1,3 @@ /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:981270 -/geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:900557,911974,912058,912297,912468,939929,1028958,1058794 -/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:1058785,1058792 +/geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:900557,911974,912058,912297,912468,939929,1028958,1058794,1058805 +/geronimo/sandbox/djencks/txmanager/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound:1058785,1058792,1058803 Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java?rev=1058806&r1=1058805&r2=1058806&view=diff ============================================================================== --- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java (original) +++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.2/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/MultiPoolConnectionInterceptor.java Thu Jan 13 23:59:42 2011 @@ -77,8 +77,8 @@ public class MultiPoolConnectionIntercep pools.put(key, (PoolingAttributes) poolInterceptor); } } - mci.setPoolInterceptor(poolInterceptor); poolInterceptor.getConnection(connectionInfo); + connectionInfo.getManagedConnectionInfo().setPoolInterceptor(poolInterceptor); } // let underlying pools handle destroyed processing...