You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ho...@apache.org on 2005/12/12 23:04:12 UTC
svn commit: r356391 -
/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Author: hogstrom
Date: Mon Dec 12 14:04:09 2005
New Revision: 356391
URL: http://svn.apache.org/viewcvs?rev=356391&view=rev
Log:
Changed processing order for the max / min pool sizes in the DatabaseWizardPortlet
Modified:
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=356391&r1=356390&r2=356391&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Mon Dec 12 14:04:09 2005
@@ -869,11 +869,15 @@
SinglePool pool = new SinglePool();
manager.setPoolSingle(pool);
pool.setMatchOne(true);
- if(data.minSize != null && !data.minSize.equals("")) {
- pool.setMinSize(new Integer(data.minSize));
- }
+ // Max Size needs to be set before the minimum. This is because
+ // the connection manager will constrain the minimum based on the
+ // current maximum value in the pool. We might consider adding a
+ // setPoolConstraints method to allow specifying both at the same time.
if(data.maxSize != null && !data.maxSize.equals("")) {
pool.setMaxSize(new Integer(data.maxSize));
+ }
+ if(data.minSize != null && !data.minSize.equals("")) {
+ pool.setMinSize(new Integer(data.minSize));
}
if(data.blockingTimeout != null && !data.blockingTimeout.equals("")) {
pool.setBlockingTimeoutMillis(new Integer(data.blockingTimeout));