From: markt Date: Thu, 30 Jul 2009 19:10:02 +0000 (+0000) Subject: Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9160ccc5dce90abe296b9c0a0c0dbeb8fe11d9f2;p=tomcat7.0 Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47577 Cosmetic fixes. Main benefit is noise reduction in Eclipse error list git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@799408 13f79535-47bb-0310-9956-ffa450edef68 --- 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 42046ec0c..dd0ebbc37 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 @@ -98,7 +98,7 @@ public class ConnectionPool { * Since newProxyInstance performs the same operation, over and over * again, it is much more optimized if we simply store the constructor ourselves. */ - private Constructor proxyClassConstructor; + private Constructor proxyClassConstructor; /** * Executor service used to cancel Futures @@ -295,10 +295,10 @@ public class ConnectionPool { * @return constructor used to instantiate the wrapper object * @throws NoSuchMethodException */ - public Constructor getProxyConstructor() throws NoSuchMethodException { + public Constructor getProxyConstructor() throws NoSuchMethodException { //cache the constructor if (proxyClassConstructor == null ) { - Class proxyClass = Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[] {java.sql.Connection.class,javax.sql.PooledConnection.class}); + Class proxyClass = Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[] {java.sql.Connection.class,javax.sql.PooledConnection.class}); proxyClassConstructor = proxyClass.getConstructor(new Class[] { InvocationHandler.class }); } return proxyClassConstructor; @@ -431,7 +431,7 @@ public class ConnectionPool { //return the members as idle to the pool for (int i = 0; i < initialPool.length; i++) { if (initialPool[i] != null) { - try {this.returnConnection(initialPool[i]);}catch(Exception x){} + try {this.returnConnection(initialPool[i]);}catch(Exception x){/*NOOP*/} } //end if } //for } //catch @@ -927,7 +927,7 @@ public class ConnectionPool { * @param con */ protected void finalize(PooledConnection con) { - + // NOOP } /** diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java index 410a06e1f..490654e87 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java @@ -68,6 +68,7 @@ public class DataSource extends DataSourceProxy implements MBeanRegistration,jav * {@inheritDoc} */ public void postRegister(Boolean registrationDone) { + // NOOP } @@ -76,6 +77,7 @@ public class DataSource extends DataSourceProxy implements MBeanRegistration,jav * {@inheritDoc} */ public void preDeregister() throws Exception { + // NOOP } /** @@ -133,6 +135,7 @@ public class DataSource extends DataSourceProxy implements MBeanRegistration,jav MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); mbs.unregisterMBean(oname); } catch (InstanceNotFoundException ignore) { + // NOOP } catch (Exception e) { log.error("Unable to unregister JDBC pool with JMX",e); } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java index 80bc1a379..11924d770 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java @@ -424,7 +424,7 @@ public class DataSourceProxy implements PoolConfiguration { try { java.util.Properties prop = DataSourceFactory .getProperties(properties); - Iterator i = prop.keySet().iterator(); + Iterator i = prop.keySet().iterator(); while (i.hasNext()) { String key = (String) i.next(); String value = prop.getProperty(key); @@ -459,6 +459,7 @@ public class DataSourceProxy implements PoolConfiguration { * {@link javax.sql.DataSource#setLogWriter(PrintWriter)} */ public void setLogWriter(PrintWriter out) throws SQLException { + // NOOP } /** diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java index 6dfde4251..5a0325c33 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java @@ -306,9 +306,9 @@ public class FairBlockingQueue implements BlockingQueue { * {@inheritDoc} */ public boolean addAll(Collection c) { - Iterator i = c.iterator(); + Iterator i = c.iterator(); while (i.hasNext()) { - E e = (E)i.next(); + E e = i.next(); offer(e); } return true; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java index e148d9fe6..78a214a55 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java @@ -71,6 +71,7 @@ public abstract class JdbcInterceptor implements InvocationHandler { * Public constructor for instantation through reflection */ public JdbcInterceptor() { + // NOOP } /** @@ -184,6 +185,7 @@ public abstract class JdbcInterceptor implements InvocationHandler { * @param pool - the pool that is being closed. */ public void poolClosed(ConnectionPool pool) { + // NOOP } /** @@ -194,6 +196,7 @@ public abstract class JdbcInterceptor implements InvocationHandler { * @param pool - the pool that is being closed. */ public void poolStarted(ConnectionPool pool) { + // NOOP } } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java index 73ef6efbe..1d32d1f3d 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java @@ -405,6 +405,7 @@ public class PoolProperties implements PoolConfiguration { */ @Override public void setAccessToUnderlyingConnectionAllowed(boolean accessToUnderlyingConnectionAllowed) { + // NOOP } /** diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java index 96c42d211..8991a605b 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java @@ -330,7 +330,7 @@ public class PooledConnection { if (log.isDebugEnabled()) log.debug("Unable to validate object:",ignore); if (stmt!=null) - try { stmt.close();} catch (Exception ignore2){} + try { stmt.close();} catch (Exception ignore2){/*NOOP*/} } return false; } //validate diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java index d11b3fa01..f3cab3a07 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java @@ -69,7 +69,7 @@ public class ProxyConnection extends JdbcInterceptor { } - public Object unwrap(Class iface) throws SQLException { + public Object unwrap(Class iface) throws SQLException { if (isWrapperFor(iface)) { return connection.getConnection(); } else { @@ -79,7 +79,7 @@ public class ProxyConnection extends JdbcInterceptor { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if (compare(ISCLOSED_VAL,method)) { - return isClosed(); + return Boolean.valueOf(isClosed()); } if (compare(CLOSE_VAL,method)) { if (isClosed()) return null; //noop for already closed. diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java index fd4d8a437..b74d0c8dc 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java @@ -97,6 +97,6 @@ public abstract class AbstractCreateStatementInterceptor extends JdbcIntercepto */ @Override public void reset(ConnectionPool parent, PooledConnection con) { - + // NOOP } } diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java index 8e00c7987..fc7c0e226 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java @@ -220,7 +220,7 @@ public abstract class AbstractQueryReport extends AbstractCreateStatementInterce //allow close to be called multiple times if (close && closed) return null; //are we calling isClosed? - if (compare(JdbcInterceptor.ISCLOSED_VAL,name)) return closed; + if (compare(JdbcInterceptor.ISCLOSED_VAL,name)) return Boolean.valueOf(closed); //if we are calling anything else, bail out if (closed) throw new SQLException("Statement closed."); boolean process = false; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java index 725614380..300b815a5 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java @@ -92,7 +92,7 @@ public class ConnectionState extends JdbcInterceptor { try { if (transactionIsolation==null || transactionIsolation.intValue()!=poolProperties.getDefaultTransactionIsolation()) { con.getConnection().setTransactionIsolation(poolProperties.getDefaultTransactionIsolation()); - transactionIsolation = poolProperties.getDefaultTransactionIsolation(); + transactionIsolation = Integer.valueOf(poolProperties.getDefaultTransactionIsolation()); } }catch (SQLException x) { transactionIsolation = null; diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java index 90839dfb2..28a71a411 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java @@ -317,16 +317,16 @@ public class SlowQueryReport extends AbstractQueryReport { public CompositeDataSupport getCompositeData(final CompositeType type) throws OpenDataException{ Object[] values = new Object[] { query, - nrOfInvocations, - maxInvocationTime, - maxInvocationDate, - minInvocationTime, - minInvocationDate, - totalInvocationTime, - failures, - prepareCount, - prepareTime, - lastInvocation + Integer.valueOf(nrOfInvocations), + Long.valueOf(maxInvocationTime), + Long.valueOf(maxInvocationDate), + Long.valueOf(minInvocationTime), + Long.valueOf(minInvocationDate), + Long.valueOf(totalInvocationTime), + Long.valueOf(failures), + Integer.valueOf(prepareCount), + Long.valueOf(prepareTime), + Long.valueOf(lastInvocation) }; return new CompositeDataSupport(type,FIELD_NAMES,values); }