Skip to content

JDBC bugfix: Don't reuse a defunct databaseMetaData #2660

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
michael-berlin merged 2 commits into from
Mar 24, 2017
+7 −3
Merged

JDBC bugfix: Don't reuse a defunct databaseMetaData #2660

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eebd543
Don't reuse a defunct databaseMetaData
bbeaudreault Mar 23, 2017
240b884
Rename to Closed
bbeaudreault Mar 24, 2017
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
10 changes: 7 additions & 3 deletions java/jdbc/src/main/java/com/flipkart/vitess/jdbc/VitessConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,11 @@ public boolean isClosed() throws SQLException {

public DatabaseMetaData getMetaData() throws SQLException {
checkOpen();
if (null != databaseMetaData) {
if (!metadataNullOrClosed()) {
return databaseMetaData;
} else {
synchronized (VitessConnection.class) {
if (null == databaseMetaData) {
if (metadataNullOrClosed()) {
String dbEngine = initializeDBProperties();
if (dbEngine.equals("mariadb")) {
databaseMetaData = new VitessMariaDBDatabaseMetadata(this);
Expand All @@ -232,6 +232,10 @@ public DatabaseMetaData getMetaData() throws SQLException {
}
}

private boolean metadataNullOrClosed() throws SQLException {
return null == databaseMetaData || null == databaseMetaData.getConnection() || databaseMetaData.getConnection().isClosed();
}

public boolean isReadOnly() throws SQLException {
checkOpen();
return readOnly;
Expand Down Expand Up @@ -786,7 +790,7 @@ private String initializeDBProperties() throws SQLException {
HashMap<String, String> dbVariables = new HashMap<>();
String dbEngine = null;

if (null == databaseMetaData) {
if (metadataNullOrClosed()) {
String versionValue;
ResultSet resultSet = null;
VitessStatement vitessStatement = new VitessStatement(this);
Expand Down