Skip to content

Include exception cause in applicable ReadWriteSplittingSQLExceptions #415

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
merged 1 commit into from
Apr 28, 2023
Merged

Include exception cause in applicable ReadWriteSplittingSQLExceptions #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions ...rc/main/java/software/amazon/jdbc/plugin/readwritesplitting/ReadWriteSplittingPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ void switchConnectionIfRequired(final boolean readOnly) throws SQLException {
} catch (final SQLException e) {
if (!isConnectionUsable(currentConnection)) {
logAndThrowException(Messages.get("ReadWriteSplittingPlugin.errorSwitchingToReader"),
SqlState.CONNECTION_UNABLE_TO_CONNECT);
SqlState.CONNECTION_UNABLE_TO_CONNECT, e);
return;
}

Expand All @@ -318,7 +318,7 @@ void switchConnectionIfRequired(final boolean readOnly) throws SQLException {
switchToWriterConnection(hosts);
} catch (final SQLException e) {
logAndThrowException(Messages.get("ReadWriteSplittingPlugin.errorSwitchingToWriter"),
SqlState.CONNECTION_UNABLE_TO_CONNECT);
SqlState.CONNECTION_UNABLE_TO_CONNECT, e);
}
}
}
Expand All @@ -335,6 +335,13 @@ private void logAndThrowException(final String logMessage, final SqlState sqlSta
throw new ReadWriteSplittingSQLException(logMessage, sqlState.getState());
}

private void logAndThrowException(
final String logMessage, final SqlState sqlState, final Throwable cause)
throws SQLException {
LOGGER.severe(logMessage);
throw new ReadWriteSplittingSQLException(logMessage, sqlState.getState(), cause);
}

private synchronized void switchToWriterConnection(
final List<HostSpec> hosts)
throws SQLException {
Expand Down
1 change: 0 additions & 1 deletion wrapper/src/test/java/integration/refactored/container/tests/ReadWriteSplittingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.TestTemplate;
Expand Down