From 73473c7fe17f732f5a51f774646172f557a933ce Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 30 Jul 2009 18:29:30 +0000 Subject: [PATCH] Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 Imports / casts git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@799400 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 8 ++++---- .../java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java index baf6a4e5f..42046ec0c 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java @@ -161,7 +161,7 @@ public class ConnectionPool { */ public Connection getConnection() throws SQLException { //check out a connection - PooledConnection con = (PooledConnection)borrowConnection(-1); + PooledConnection con = borrowConnection(-1); return setupConnection(con); } @@ -770,9 +770,9 @@ public class ConnectionPool { */ protected boolean shouldAbandon() { if (poolProperties.getAbandonWhenPercentageFull()==0) return true; - float used = (float)busy.size(); - float max = (float)poolProperties.getMaxActive(); - float perc = (float)poolProperties.getAbandonWhenPercentageFull(); + float used = busy.size(); + float max = poolProperties.getMaxActive(); + float perc = poolProperties.getAbandonWhenPercentageFull(); return (used/max*100f)>=perc; } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java index 8d5092eec..7632d37c4 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java @@ -15,8 +15,6 @@ */ package org.apache.tomcat.jdbc.pool.jmx; -import java.util.Properties; - import org.apache.tomcat.jdbc.pool.PoolConfiguration; public interface ConnectionPoolMBean extends PoolConfiguration { -- 2.11.0