Author: [log in to unmask] Date: Tue Mar 29 16:17:18 2016 New Revision: 4330 Log: Cleanup should no longer be needed with changes to connection management. Modified: java/branches/jeremy-dev2/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java Modified: java/branches/jeremy-dev2/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java ============================================================================= --- java/branches/jeremy-dev2/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java (original) +++ java/branches/jeremy-dev2/job/src/main/java/org/hps/job/DatabaseConditionsManagerSetup.java Tue Mar 29 16:17:18 2016 @@ -1,9 +1,6 @@ package org.hps.job; -import java.sql.Connection; -import java.sql.SQLException; import java.util.Set; -import java.util.logging.Level; import java.util.logging.Logger; import org.hps.conditions.database.DatabaseConditionsManager; @@ -111,19 +108,5 @@ */ @Override public void cleanup() { - - LOGGER.config("conditions cleanup"); - - // Close the conditions database connection. - Connection connection = DatabaseConditionsManager.getInstance().getConnection(); - try { - if (connection != null && !connection.isClosed()) { - DatabaseConditionsManager.getInstance().closeConnection(); - } - } catch (SQLException e) { - LOGGER.log(Level.WARNING, e.getMessage(), e); - } - - LOGGER.config("done cleaning up"); } }