You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@commons.apache.org by ps...@apache.org on 2009/11/01 18:02:30 UTC

svn commit: r831707 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java

Author: psteitz
Date: Sun Nov  1 17:02:29 2009
New Revision: 831707

URL: http://svn.apache.org/viewvc?rev=831707&view=rev
Log:
Avoid possible NPE on toString().

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java?rev=831707&r1=831706&r2=831707&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDataSource.java Sun Nov  1 17:02:29 2009
@@ -350,7 +350,7 @@
 
         public String toString() {
             if (delegate == null){
-                return null;
+                return "NULL";
             }
             return delegate.toString();
         }