wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore already closed repo close calls

Browse Source
This commit is contained in:
James Seibel
2026-03-22 21:36:31 -05:00
parent acecbede8e
commit 63d6d42356
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/sql/repo/AbstractDhRepo.java
+4 -19
View File
@@ -25,9 +25,11 @@ import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
import com.seibel.distanthorizons.core.sql.DbConnectionClosedException;
import com.seibel.distanthorizons.core.sql.dto.IBaseDTO;
import com.seibel.distanthorizons.core.sql.repo.phantoms.AutoClosableTrackingWrapper;
import com.seibel.distanthorizons.core.util.ExceptionUtil;
import com.seibel.distanthorizons.core.util.KeyedLockContainer;
import com.seibel.distanthorizons.coreapi.ModInfo;
import com.seibel.distanthorizons.core.logging.DhLogger;
import com.seibel.distanthorizons.coreapi.util.StringUtil;
import org.jetbrains.annotations.Nullable;
import java.io.File;
@@ -496,20 +498,12 @@ public abstract class AbstractDhRepo<TKey, TDTO extends IBaseDTO<TKey>> implemen
Connection connection = CONNECTIONS_BY_CONNECTION_STRING.remove(connectionString);
if (connection != null)
{
// don't try closing an already closed connection
if (!connection.isClosed())
{
LOGGER.info("Closing database connection: [" + connectionString + "]");
connection.close();
}
else
{
// these warnings can be ignored in release builds, as long as the connection is closed it doesn't really matter
// TODO fix duplicate closes
if (ModInfo.IS_DEV_BUILD)
{
LOGGER.warn("Attempting to close already closed database connection: [" + connectionString + "]");
}
}
}
}
catch(SQLException e)
@@ -560,22 +554,13 @@ public abstract class AbstractDhRepo<TKey, TDTO extends IBaseDTO<TKey>> implemen
LOGGER.warn(stringBuilder.toString());
}
// don't try closing an already closed connection
if (!this.connection.isClosed())
{
LOGGER.info("Closing database connection: [" + this.connectionString + "]...");
this.connection.close();
LOGGER.info("Finished closing database connection: [" + this.connectionString + "]");
}
else
{
// these warnings can be ignored in release builds, as long as the connection is closed it doesn't really matter
// TODO fix duplicate closes
if (ModInfo.IS_DEV_BUILD)
{
LOGGER.warn("Attempting to close already closed database connection: [" + this.connectionString + "]");
}
}
}
ACTIVE_CONNECTION_STRINGS_BY_REPO.remove(this);
}