Author: markt
Date: Mon Aug 10 09:49:55 2015
New Revision: 1695007
URL: http://svn.apache.org/r1695007
Log:
Fix checkstyle errors in DBCP2 updates
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 10 09:49:55 2015
@@ -1,2 +1,2 @@
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1694605
-/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658
+/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java?rev=1695007&r1=1695006&r2=1695007&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
Mon Aug 10 09:49:55 2015
@@ -517,7 +517,7 @@ public class BasicDataSourceFactory impl
if (value != null) {
dataSource.setLogAbandoned(Boolean.valueOf(value).booleanValue());
}
-
+
value = properties.getProperty(PROP_ABANDONEDUSAGETRACKING);
if (value != null) {
dataSource.setAbandonedUsageTracking(Boolean.valueOf(value).booleanValue());
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java?rev=1695007&r1=1695006&r2=1695007&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
Mon Aug 10 09:49:55 2015
@@ -185,7 +185,7 @@ class CPDSConnectionFactory
valid = false;
} finally {
Utils.closeQuietly(conn);
- validatingSet.remove(pconn);
+ validatingSet.remove(pconn);
}
} else {
Statement stmt = null;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1695007&r1=1695006&r2=1695007&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
Mon Aug 10 09:49:55 2015
@@ -185,7 +185,7 @@ class KeyedCPDSConnectionFactory
valid = false;
} finally {
Utils.closeQuietly(conn);
- validatingSet.remove(pconn);
+ validatingSet.remove(pconn);
}
} else {
Statement stmt = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
