svn commit: r1557577 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2: BasicDataSource.java PoolableConnectionFactory.java managed/BasicManagedDataSource.java

[markt]

Author: markt
Date: Sun Jan 12 18:03:14 2014
New Revision: 1557577

URL: http://svn.apache.org/r1557577
Log:
Reduce FindBugs warnings
Use synchronisation consistently

Modified:
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1557577&r1=1557576&r2=1557577&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
 Sun Jan 12 18:03:14 2014
@@ -570,7 +570,7 @@ public class BasicDataSource
      * Prepared statement pooling for this pool. When this property is set to 
<code>true</code>
      * both PreparedStatements and CallableStatements are pooled.
      */
-    protected boolean poolPreparedStatements = false;
+    private boolean poolPreparedStatements = false;
 
     /**
      * Returns true if we are pooling statements.
@@ -608,7 +608,7 @@ public class BasicDataSource
      * and <code>maxOpenPreparedStatements</code> limits the total number of 
prepared or callable statements
      * that may be in use at a given time.</p>
      */
-    protected int maxOpenPreparedStatements =
+    private int maxOpenPreparedStatements =
         GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL;
 
     /**

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1557577&r1=1557576&r2=1557577&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
 Sun Jan 12 18:03:14 2014
@@ -91,8 +91,7 @@ public class PoolableConnectionFactory
      * @param connectionInitSqls SQL statement to initialize {@link 
Connection}s.
      * @since 1.3
      */
-    synchronized public void setConnectionInitSql(
-            Collection<String> connectionInitSqls) {
+    public void setConnectionInitSql(Collection<String> connectionInitSqls) {
         _connectionInitSqls = connectionInitSqls;
     }
 
@@ -301,7 +300,7 @@ public class PoolableConnectionFactory
             conn.rollback();
         }
         conn.clearWarnings();
-        // DBCP-97 Idle connections in the pool should have autoCommit enabled 
+        // DBCP-97 Idle connections in the pool should have autoCommit enabled
         if(!connAutoCommit) {
             conn.setAutoCommit(true);
         }

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java?rev=1557577&r1=1557576&r2=1557577&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
 Sun Jan 12 18:03:14 2014
@@ -193,9 +193,9 @@ public class BasicManagedDataSource exte
             connectionFactory.setDefaultAutoCommit(defaultAutoCommit);
             
connectionFactory.setDefaultTransactionIsolation(defaultTransactionIsolation);
             connectionFactory.setDefaultCatalog(defaultCatalog);
-            connectionFactory.setPoolStatements(poolPreparedStatements);
+            connectionFactory.setPoolStatements(isPoolPreparedStatements());
             connectionFactory.setMaxOpenPrepatedStatements(
-                    maxOpenPreparedStatements);
+                    getMaxOpenPreparedStatements());
             
connectionFactory.setMaxConnLifetimeMillis(getMaxConnLifetimeMillis());
             validateConnectionFactory(connectionFactory);
         } catch (RuntimeException e) {