-
Notifications
You must be signed in to change notification settings - Fork 435
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.
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
Fixes all statement leaks in the driver. #455
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
35cfed9
Fixes all statement leaks in the driver.
peterbae d068bda
Fix issues with resultset getting closed before it's consumed / closi…
peterbae 195719e
test
peterbae 332a942
Removed logic for closing a statement that is still used somewhere, a…
peterbae 9859067
remove unnecessary import
peterbae 94f8829
Change formatting
peterbae File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -98,6 +98,9 @@ public class SQLServerPreparedStatement extends SQLServerStatement implements IS | |
|
||
/** The prepared statement handle returned by the server */ | ||
private int prepStmtHandle = 0; | ||
|
||
/** Statement used for getMetadata(). Declared as a field to facilitate closing the statement. */ | ||
private SQLServerStatement internalStmt = null; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. having internalStmt as a field is the only way to close it after the user is done working with the ResultsetMetadata. |
||
|
||
private void setPreparedStatementHandle(int handle) { | ||
this.prepStmtHandle = handle; | ||
|
@@ -271,6 +274,18 @@ final void closeInternal() { | |
|
||
// If we have a prepared statement handle, close it. | ||
closePreparedHandle(); | ||
|
||
// Close the statement that was used to generate empty statement from getMetadata(). | ||
try { | ||
if (null != internalStmt) | ||
internalStmt.close(); | ||
} catch (SQLServerException e) { | ||
if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) | ||
loggerExternal.finer("Ignored error closing internal statement: " + e.getErrorCode() + " " + e.getMessage()); | ||
} | ||
finally { | ||
internalStmt = null; | ||
} | ||
|
||
// Clean up client-side state | ||
batchParamValues = null; | ||
|
@@ -1023,8 +1038,8 @@ else if (resultSet != null) { | |
ResultSet emptyResultSet = null; | ||
try { | ||
fmtSQL = replaceMarkerWithNull(fmtSQL); | ||
SQLServerStatement stmt = (SQLServerStatement) connection.createStatement(); | ||
emptyResultSet = stmt.executeQueryInternal("set fmtonly on " + fmtSQL + "\nset fmtonly off"); | ||
internalStmt = (SQLServerStatement) connection.createStatement(); | ||
emptyResultSet = internalStmt.executeQueryInternal("set fmtonly on " + fmtSQL + "\nset fmtonly off"); | ||
} | ||
catch (SQLException sqle) { | ||
if (false == sqle.getMessage().equals(SQLServerException.getErrString("R_noResultset"))) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i guess s doesnt need to be instantiated to null but i did it for consistency