geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r911662 - in /geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1: ./ geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/
Date Fri, 19 Feb 2010 00:58:07 GMT
Author: djencks
Date: Fri Feb 19 00:58:07 2010
New Revision: 911662

URL: http://svn.apache.org/viewvc?rev=911662&view=rev
Log:
GERONIMO-5150 don't expand the pool when releasing idle connections.  Also include error checking
merge from 2.2

Modified:
    geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/   (props changed)
    geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
    geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/WrapperNamedXAResource.java

Propchange: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/
------------------------------------------------------------------------------
    svn:mergeinfo = /geronimo/components/txmanager/trunk:900557

Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java?rev=911662&r1=911661&r2=911662&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
(original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
Fri Feb 19 00:58:07 2010
@@ -372,7 +372,6 @@
                     ConnectionInfo killInfo = new ConnectionInfo(managedConnectionInfo);
                     interceptor.internalReturn(killInfo, ConnectionReturnAction.DESTROY);
                 }
-                interceptor.permits.release(killList.size());
             } catch (Throwable t) {
                 log.error("Error occurred during execution of ExpirationMonitor TimerTask",
t);
             } finally {

Modified: geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/WrapperNamedXAResource.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/WrapperNamedXAResource.java?rev=911662&r1=911661&r2=911662&view=diff
==============================================================================
--- geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/WrapperNamedXAResource.java
(original)
+++ geronimo/components/txmanager/branches/geronimo-txmanager-parent-2.1/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/WrapperNamedXAResource.java
Fri Feb 19 00:58:07 2010
@@ -35,6 +35,8 @@
     private final String name;
 
     public WrapperNamedXAResource(XAResource xaResource, String name) {
+        if (xaResource == null) throw new NullPointerException("No XAResource supplied. 
XA support may not be configured properly");
+        if (name == null) throw new NullPointerException("No name supplied. Resource adapter
not properly configured");
         this.xaResource = xaResource;
         this.name = name;
     }



Mime
View raw message