Skip to content
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

Disable jdbc4ConnectionTest when connectionTestQuery is set #48

Closed
wants to merge 1 commit into from
Closed

Disable jdbc4ConnectionTest when connectionTestQuery is set #48

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
6 changes: 5 additions & 1 deletion src/main/java/com/zaxxer/hikari/HikariConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,11 @@ else if (idleTimeout < 30000 && idleTimeout != 0)
idleTimeout = IDLE_TIMEOUT;
}

if (!isJdbc4connectionTest && connectionTestQuery == null)
if (connectionTestQuery != null)
{
isJdbc4connectionTest = false;
}
else if (!isJdbc4connectionTest)
{
logger.error("Either jdbc4ConnectionTest must be enabled or a connectionTestQuery must be specified.");
throw new IllegalStateException("Either jdbc4ConnectionTest must be enabled or a connectionTestQuery must be specified.");
Expand Down