commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r895870 - in /commons/proper/dbcp/trunk: src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java xdocs/changes.xml
Date Tue, 05 Jan 2010 03:07:53 GMT
Author: sebb
Date: Tue Jan  5 03:07:51 2010
New Revision: 895870

URL: http://svn.apache.org/viewvc?rev=895870&view=rev
Log:
DBCP-316 Remove impossible null check.

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
    commons/proper/dbcp/trunk/xdocs/changes.xml

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java?rev=895870&r1=895869&r2=895870&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
Tue Jan  5 03:07:51 2010
@@ -178,11 +178,9 @@
             info = (PooledConnectionAndInfo) pool.borrowObject(key);
         }
         catch (SQLException ex) {  // Remove bad UserPassKey
-            if (userKeys != null) {
-                synchronized (userKeys) {
-                    if (userKeys.containsKey(username)) {
-                        userKeys.remove(username);
-                    }
+            synchronized (userKeys) {
+                if (userKeys.containsKey(username)) {
+                    userKeys.remove(username);
                 }
             }
             throw new SQLNestedException(

Modified: commons/proper/dbcp/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=895870&r1=895869&r2=895870&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/xdocs/changes.xml (original)
+++ commons/proper/dbcp/trunk/xdocs/changes.xml Tue Jan  5 03:07:51 2010
@@ -54,6 +54,9 @@
         PooledConnection.removeConnectionEventListener(ConnectionEventListener)
         as the method does not throw any Exceptions.
       </action>
+      <action dev="sebb" type="fix" issue="DBCP-316" due-to="Sebastian Bazley">
+        Remove impossible null check.
+      </action>
       <action dev="sebb" type="update" issue="DBCP-314" due-to="Sebastian Bazley">
         Renamed variables with duplicate names in different scopes.
       </action>



Mime
View raw message