svn commit: r1057268 - in /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool: ConnectionPool.java PoolProperties.java

[fhanik]

Author: fhanik
Date: Mon Jan 10 16:41:43 2011
New Revision: 1057268

URL: http://svn.apache.org/viewvc?rev=1057268&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50333
dont allow 0 or negative max active values

Modified:
    
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
    
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1057268&r1=1057267&r2=1057268&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
 Mon Jan 10 16:41:43 2011
@@ -402,6 +402,10 @@ public class ConnectionPool {
         } //end if
 
         //make sure the pool is properly configured
+        if (properties.getMaxActive()<1) {
+            log.warn("maxActive is smaller than 1, setting maxActive to: 
"+PoolProperties.DEFAULT_MAX_ACTIVE);
+            properties.setMaxActive(PoolProperties.DEFAULT_MAX_ACTIVE);
+        }
         if (properties.getMaxActive()<properties.getInitialSize()) {
             log.warn("initialSize is larger than maxActive, setting 
initialSize to: "+properties.getMaxActive());
             properties.setInitialSize(properties.getMaxActive());

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1057268&r1=1057267&r2=1057268&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
 Mon Jan 10 16:41:43 2011
@@ -36,6 +36,8 @@ import org.apache.juli.logging.LogFactor
 public class PoolProperties implements PoolConfiguration {
     private static final Log log = LogFactory.getLog(PoolProperties.class);
     
+    public static final int DEFAULT_MAX_ACTIVE = 100;
+    
     protected static AtomicInteger poolCounter = new AtomicInteger(0);
     protected Properties dbProperties = new Properties();
     protected String url = null;
@@ -46,7 +48,7 @@ public class PoolProperties implements P
     protected String defaultCatalog = null;
     protected String connectionProperties;
     protected int initialSize = 10;
-    protected int maxActive = 100;
+    protected int maxActive = DEFAULT_MAX_ACTIVE;
     protected int maxIdle = maxActive;
     protected int minIdle = initialSize;
     protected int maxWait = 30000;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org