svn commit: r1695006 - in /tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2: BasicDataSourceFactory.java datasources/CPDSConnectionFactory.java datasources/KeyedCPDSConnectionFactory.java

[markt]

Author: markt
Date: Mon Aug 10 09:46:19 2015
New Revision: 1695006

URL: http://svn.apache.org/r1695006
Log:
Fix checkstyle errors in DBCP2 updates

Modified:
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
    
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
    
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java?rev=1695006&r1=1695005&r2=1695006&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java 
Mon Aug 10 09:46:19 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/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java?rev=1695006&r1=1695005&r2=1695006&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
 Mon Aug 10 09:46:19 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/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1695006&r1=1695005&r2=1695006&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
 Mon Aug 10 09:46:19 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