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 2012/10/13 18:04:33 UTC
svn commit: r1397873 - in
/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool:
DataSourceProxy.java JdbcInterceptor.java PooledConnection.java
Author: markt
Date: Sat Oct 13 16:04:33 2012
New Revision: 1397873
URL: http://svn.apache.org/viewvc?rev=1397873&view=rev
Log:
Fix some Eclipse / Javadoc warnings
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1397873&r1=1397872&r2=1397873&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java Sat Oct 13 16:04:33 2012
@@ -211,7 +211,7 @@ public class DataSourceProxy implements
}
}
- public int getPoolSize() throws SQLException{
+ public int getPoolSize() {
final ConnectionPool p = pool;
if (p == null) return 0;
else return p.getSize();
@@ -1296,9 +1296,6 @@ public class DataSourceProxy implements
getPoolProperties().setPropagateInterruptState(propagateInterruptState);
}
- /**
- * {@inheritDoc}
- */
public void purge() {
try {
createPool().purge();
@@ -1307,9 +1304,6 @@ public class DataSourceProxy implements
}
}
- /**
- * {@inheritDoc}
- */
public void purgeOnReturn() {
try {
createPool().purgeOnReturn();
@@ -1317,5 +1311,4 @@ public class DataSourceProxy implements
log.error("Unable to purge pool.",x);
}
}
-
}
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=1397873&r1=1397872&r2=1397873&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java Sat Oct 13 16:04:33 2012
@@ -62,7 +62,7 @@ public abstract class JdbcInterceptor im
public static final String ISWRAPPERFOR_VAL = "isWrapperFor";
/**
- * {@link java.sql.Connection#isValid(boolean)} method name
+ * {@link java.sql.Connection#isValid(int)} method name
*/
public static final String ISVALID_VAL = "isValid";
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1397873&r1=1397872&r2=1397873&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java (original)
+++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java Sat Oct 13 16:04:33 2012
@@ -365,7 +365,6 @@ public class PooledConnection {
* Returns true if the connection pool is configured
* to do validation for a certain action.
* @param action
- * @return
*/
private boolean doValidate(int action) {
if (action == PooledConnection.VALIDATE_BORROW &&
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org