From 19894bc6dd39851df255e442c8560b5acb8ae9e0 Mon Sep 17 00:00:00 2001 From: Benjamin Armintor Date: Thu, 14 Aug 2014 14:49:10 -0400 Subject: [PATCH] FCREPO-1213: do not attempt to change read-only state of closed connections --- .../java/org/fcrepo/server/storage/ConnectionPool.java | 10 +++++++--- 1 file changed, 7 insertions(+), 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 index 31cd57235..f08357284 100755 --- 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 {