From: fhanik Date: Mon, 10 Jan 2011 16:38:08 +0000 (+0000) Subject: https://issues.apache.org/bugzilla/show_bug.cgi?id=49953 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c8df75296732cf241cbc72441e0f974cdec42b35;p=tomcat7.0 https://issues.apache.org/bugzilla/show_bug.cgi?id=49953 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1057267 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java index 27370d0f7..533211ce7 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java @@ -63,6 +63,7 @@ public class StatementCache extends StatementDecoratorInterceptor { return cacheSize; } + @Override public void setProperties(Map properties) { super.setProperties(properties); InterceptorProperty p = properties.get("prepared"); @@ -90,11 +91,13 @@ public class StatementCache extends StatementDecoratorInterceptor { private AtomicInteger cacheSize; + @Override public void poolStarted(ConnectionPool pool) { cacheSizeMap.putIfAbsent(pool, new AtomicInteger(0)); super.poolStarted(pool); } + @Override public void poolClosed(ConnectionPool pool) { cacheSizeMap.remove(pool); super.poolClosed(pool); @@ -156,7 +159,7 @@ public class StatementCache extends StatementDecoratorInterceptor { } } - + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { boolean process = process(this.types, method, false); if (process && args.length>0 && args[0] instanceof String) { diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java index 1f5d9c87f..99b55b6e0 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java @@ -75,7 +75,7 @@ public class ConnectionPool extends NotificationBroadcasterSupport implements Co public static final String FAILED_QUERY_NOTIFICATION = "FAILED QUERY"; public static final String SUSPECT_ABANDONED_NOTIFICATION = "SUSPECT CONNETION ABANDONED"; - + @Override public MBeanNotificationInfo[] getNotificationInfo() { MBeanNotificationInfo[] pres = super.getNotificationInfo(); MBeanNotificationInfo[] loc = getDefaultNotificationInfo();