[infinispan-commits] Infinispan SVN: r2135 - trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-08-03 06:25:32 -0400 (Tue, 03 Aug 2010)
New Revision: 2135

Modified:
   trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
Log:
[ISPN-564] (ManagedConnectionFactory releaseConnection can throw NullPointerException) Fixed.

Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java	2010-08-03 10:24:00 UTC (rev 2134)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/ManagedConnectionFactory.java	2010-08-03 10:25:32 UTC (rev 2135)
@@ -99,8 +99,9 @@
    }
 
    public void releaseConnection(Connection conn) {
-      try {
-         conn.close();
+      try {         
+         if (conn != null) // Could be null if getConnection failed
+            conn.close();
       } catch (SQLException e) {
          log.warn("Issues while closing connection " + conn, e);
       }