You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2014/01/29 08:43:24 UTC

svn commit: r1562374 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java

Author: markt
Date: Wed Jan 29 07:43:24 2014
New Revision: 1562374

URL: http://svn.apache.org/r1562374
Log:
Fix Eclipse warning. password could be null here

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1562374&r1=1562373&r2=1562374&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java Wed Jan 29 07:43:24 2014
@@ -815,7 +815,7 @@ public abstract class InstanceKeyDataSou
                     closeDueToException(info);
                     throw new SQLException("Cannot borrow connection from pool", e);
                 }
-                if (info != null && password.equals(info.getPassword())) {
+                if (info != null && password != null && password.equals(info.getPassword())) {
                     break;
                 } else {
                     if (info != null) {