You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/08/08 16:06:31 UTC
svn commit: r1616763 - in
/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc:
naming/GenericNamingResourcesFactory.java pool/ConnectionPool.java
pool/PoolProperties.java pool/interceptor/StatementFinalizer.java
Author: markt
Date: Fri Aug 8 14:06:31 2014
New Revision: 1616763
URL: http://svn.apache.org/r1616763
Log:
Whitespace police
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1616763&r1=1616762&r2=1616763&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java Fri Aug 8 14:06:31 2014
@@ -59,7 +59,7 @@ public class GenericNamingResourcesFacto
Enumeration<RefAddr> refs = ref.getAll();
String type = ref.getClassName();
- Object o =
+ Object o =
ClassLoaderUtil.loadClass(
type,
GenericNamingResourcesFactory.class.getClassLoader(),
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1616763&r1=1616762&r2=1616763&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Fri Aug 8 14:06:31 2014
@@ -780,10 +780,10 @@ public class ConnectionPool {
//the connection shouldn't have to poll again.
try {
con.reconnect();
- int validationMode = getPoolProperties().isTestOnConnect() || getPoolProperties().getInitSQL()!=null ?
- PooledConnection.VALIDATE_INIT :
+ int validationMode = getPoolProperties().isTestOnConnect() || getPoolProperties().getInitSQL()!=null ?
+ PooledConnection.VALIDATE_INIT :
PooledConnection.VALIDATE_BORROW;
-
+
if (con.validate(validationMode)) {
//set the timestamp
con.setTimestamp(now);
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1616763&r1=1616762&r2=1616763&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Fri Aug 8 14:06:31 2014
@@ -962,7 +962,7 @@ public class PoolProperties implements P
log.debug("Loading interceptor class:"+PoolConfiguration.PKG_PREFIX+getClassName());
}
clazz = ClassLoaderUtil.loadClass(
- PoolConfiguration.PKG_PREFIX+getClassName(),
+ PoolConfiguration.PKG_PREFIX+getClassName(),
this.getClass().getClassLoader(),
Thread.currentThread().getContextClassLoader()
);
@@ -971,7 +971,7 @@ public class PoolProperties implements P
log.debug("Loading interceptor class:"+getClassName());
}
clazz = ClassLoaderUtil.loadClass(
- getClassName(),
+ getClassName(),
this.getClass().getClassLoader(),
Thread.currentThread().getContextClassLoader()
);
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java?rev=1616763&r1=1616762&r2=1616763&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java Fri Aug 8 14:06:31 2014
@@ -16,12 +16,6 @@
*/
package org.apache.tomcat.jdbc.pool.interceptor;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.jdbc.pool.ConnectionPool;
-import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.apache.tomcat.jdbc.pool.PooledConnection;
-
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.sql.Statement;
@@ -29,6 +23,12 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.jdbc.pool.ConnectionPool;
+import org.apache.tomcat.jdbc.pool.PoolProperties;
+import org.apache.tomcat.jdbc.pool.PooledConnection;
+
/**
* Keeps track of statements associated with a connection and invokes close upon {@link java.sql.Connection#close()}
* Useful for applications that dont close the associated statements after being done with a connection.
@@ -38,9 +38,9 @@ public class StatementFinalizer extends
private static final Log log = LogFactory.getLog(StatementFinalizer.class);
protected List<WeakReference<StatementEntry>> statements = new LinkedList<>();
-
+
private boolean logCreationStack = false;
-
+
@Override
public Object createStatement(Object proxy, Method method, Object[] args, Object statement, long time) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org