Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Message-ID: <20051212220434.46416.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r356392 -
 /geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Date: Mon, 12 Dec 2005 22:04:33 -0000
To: scm@geronimo.apache.org
From: hogstrom@apache.org

Author: hogstrom
Date: Mon Dec 12 14:04:32 2005
New Revision: 356392

URL: http://svn.apache.org/viewcvs?rev=356392&view=rev
Log:
Changed processing order for the max / min pool sizes in the DatabaseWizardPortlet

Modified:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=356392&r1=356391&r2=356392&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Mon Dec 12 14:04:32 2005
@@ -812,7 +812,7 @@
                 Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
                 ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
                 connector.setConfigID("user/database-pool"+data.getName() + "/1/car");
-                connector.setParentID("geronimo/j2ee-server/1.0/car");
+                connector.setParentID("geronimo/j2ee-server/1.0-SNAPSHOT/car");
                 if(data.jar1 != null && !data.jar1.equals("")) {
                     Dependency dep = new Dependency();
                     connector.setDependency(new Dependency[]{dep});
@@ -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));