svn commit: r1572018 - in /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2: DelegatingResultSet.java PoolingDriver.java Utils.java

[ma...@apache.org]

Author: markt
Date: Wed Feb 26 11:42:24 2014
New Revision: 1572018

URL: http://svn.apache.org/r1572018
Log:
Fix checkstyle errors

Modified:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Utils.java

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1572018&r1=1572017&r2=1572018&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java Wed Feb 26 11:42:24 2014
@@ -56,7 +56,7 @@ import java.sql.SQLXML;
  * @author Dirk Verbeeck
  * @version $Revision$ $Date$
  */
-public class DelegatingResultSet extends AbandonedTrace implements ResultSet {
+public final class DelegatingResultSet extends AbandonedTrace implements ResultSet {
 
     /** My delegate. **/
     private final ResultSet _res;

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java?rev=1572018&r1=1572017&r2=1572018&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java Wed Feb 26 11:42:24 2014
@@ -50,7 +50,7 @@ public class PoolingDriver implements Dr
     }
 
     /** The map of registered pools. */
-    protected static final HashMap<String,ObjectPool<? extends Connection>> _pools =
+    protected static final HashMap<String,ObjectPool<? extends Connection>> pools =
             new HashMap<>();
 
     /** Controls access to the underlying connection */
@@ -79,7 +79,7 @@ public class PoolingDriver implements Dr
 
     public synchronized ObjectPool<? extends Connection> getConnectionPool(String name)
             throws SQLException {
-        ObjectPool<? extends Connection> pool = _pools.get(name);
+        ObjectPool<? extends Connection> pool = pools.get(name);
         if (null == pool) {
             throw new SQLException("Pool not registered.");
         }
@@ -88,13 +88,13 @@ public class PoolingDriver implements Dr
 
     public synchronized void registerPool(String name,
             ObjectPool<? extends Connection> pool) {
-        _pools.put(name,pool);
+        pools.put(name,pool);
     }
 
     public synchronized void closePool(String name) throws SQLException {
-        ObjectPool<? extends Connection> pool = _pools.get(name);
+        ObjectPool<? extends Connection> pool = pools.get(name);
         if (pool != null) {
-            _pools.remove(name);
+            pools.remove(name);
             try {
                 pool.close();
             }
@@ -105,7 +105,7 @@ public class PoolingDriver implements Dr
     }
 
     public synchronized String[] getPoolNames(){
-        Set<String> names = _pools.keySet();
+        Set<String> names = pools.keySet();
         return names.toArray(new String[names.size()]);
     }
 

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Utils.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Utils.java?rev=1572018&r1=1572017&r2=1572018&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Utils.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Utils.java Wed Feb 26 11:42:24 2014
@@ -27,7 +27,7 @@ import java.util.ResourceBundle;
 /**
  * Utility methods
  */
-public class Utils {
+public final class Utils {
 
     private static final ResourceBundle messages = ResourceBundle.getBundle(
             Utils.class.getPackage().getName() + ".LocalStrings");