Skip to content

Fixed ClosedFileSystemException in /db-admin migrate #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MoonTM-GIT merged 2 commits into from
Aug 1, 2022
Merged

Fixed ClosedFileSystemException in /db-admin migrate #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f351be
Moved FileSystem out of try-with-resources statement
MoonTM-GIT Aug 1, 2022
28a353e
Close FileSystem later
MoonTM-GIT Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/java/net/javadiscord/javabot/data/h2db/MigrationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ public static Path getMigrationsDirectory() throws URISyntaxException, IOExcepti
return Path.of(uri);
} catch (FileSystemNotFoundException e) {
Map<String, String> env = new HashMap<>();
try (FileSystem dir = FileSystems.newFileSystem(uri, env)) {
return dir.getPath("/database/migrations/");
}
FileSystem dir = FileSystems.newFileSystem(uri, env);
return dir.getPath("/database/migrations/");
}
}
}
1 change: 1 addition & 0 deletions src/main/java/net/javadiscord/javabot/data/h2db/commands/MigrateSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
return;
}
String sql = Files.readString(migrationFile);
migrationsDir.getFileSystem().close();
String[] statements = sql.split("\\s*;\\s*");
if (statements.length == 0) {
Responses.error(event, "The migration `" + migrationName + "` does not contain any statements. Please remove or edit it before running again.").queue();
Expand Down