[jboss-cvs] JBossAS SVN: r59873 - branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager.

[jboss-cvs-commits at lists.jboss.org]

Author: weston.price at jboss.com
Date: 2007-01-20 03:15:43 -0500 (Sat, 20 Jan 2007)
New Revision: 59873

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
Log:
[JBAS-3911] Max pool size should be set to min pool size if the latter
is less than the former. 



Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2007-01-20 07:00:22 UTC (rev 59872)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2007-01-20 08:15:43 UTC (rev 59873)
@@ -117,7 +117,16 @@
       defaultSubject = subject;
       defaultCri = cri;
       this.poolParams = poolParams;
-      this.maxSize = poolParams.maxSize;
+
+      if(this.poolParams.minSize > maxSize)
+      {
+         log.trace("Minimum pool size exceeds maximum pool size. Setting max size to " + this.poolParams.minSize + " Please verify your *-ds.xml file.");
+         this.maxSize = this.poolParams.minSize;
+      }
+      else
+      {
+         this.maxSize = poolParams.maxSize;
+      }
       this.log = log;
       this.trace = log.isTraceEnabled();
       cls = new ArrayList(this.maxSize);