Author: athimel Date: 2014-05-12 10:24:50 +0200 (Mon, 12 May 2014) New Revision: 3102 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3102 Log: fixes #3192 Avoid NPE when trying to close a non-existing connection Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java 2014-05-09 05:52:11 UTC (rev 3101) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java 2014-05-12 08:24:50 UTC (rev 3102) @@ -242,6 +242,13 @@ @Override public void closeConnection(Connection conn) throws SQLException { + if (conn == null) { + if (log.isDebugEnabled()) { + log.debug("No JDBC connection to close"); + } + return; + } + // if connection is already closed, nothing has to be done // we can't keep this connection (and can not be push in pool)