FCREPO-1213: do not attempt to change read-only state of closed conne…

…ctions
fcrepo3 · Aug 14, 2014 · 19894bc · 19894bc
1 parent cb30fc5
commit 19894bc
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/fcrepo-server/src/main/java/org/fcrepo/server/storage/ConnectionPool.java b/fcrepo-server/src/main/java/org/fcrepo/server/storage/ConnectionPool.java
@@ -331,9 +331,13 @@ public Connection getReadWriteConnection() throws SQLException {
      */
     public void free(Connection connection) {
         try {
-            // ensure connections returned to pool as read-only
-            setConnectionReadOnly(connection, true);
-            if (!connection.isClosed()) connection.close();
+            if (!connection.isClosed()){
+                // ensure connections returned to pool as read-only
+                setConnectionReadOnly(connection, true);
+                connection.close();
+            } else {
+                logger.debug("Ignoring attempt to close a previously closed connection");
+            }
         } catch (SQLException sqle) {
             logger.warn("Unable to close connection", sqle);
         } finally {