geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
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 GMT
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...



Mime
View raw message