Skip to content

Don't commit the JdbcCallEvent multiple times #7

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

Open
MariusVolkhart wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't commit the JdbcCallEvent multiple times #7

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
7 changes: 7 additions & 0 deletions src/main/java/com/github/marschall/jfr/jdbc/JdbcCallEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,11 @@ class JdbcCallEvent extends Event {
this.query = query;
}

void close() {
if (!closed) {
closed = true;
end();
commit();
}
}
}
8 changes: 2 additions & 6 deletions src/main/java/com/github/marschall/jfr/jdbc/JfrPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ private JdbcOperationEvent newOperationEvent(String operationName) {
@Override
public void close() throws SQLException {
if (!this.closed && !this.callEvent.closed) {
this.callEvent.end();
this.callEvent.commit();
this.callEvent.closed = true;
this.callEvent.close();
this.closed = true;
}
this.delegate.close();
Expand Down Expand Up @@ -228,9 +226,7 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw
@Override
public void clearParameters() throws SQLException {
if (!this.closed && !this.callEvent.closed) {
this.callEvent.end();
this.callEvent.commit();
this.callEvent.closed = true;
this.callEvent.close();

this.callEvent = new JdbcCallEvent(this.callEvent.query);
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/github/marschall/jfr/jdbc/JfrResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ private JdbcOperationEvent newOperationEvent(String operationName) {
public void close() throws SQLException {
if (!this.closed) {
this.callEvent.rowCount = this.rowCount;
this.callEvent.end();
this.callEvent.commit();
this.callEvent.closed = true;
this.callEvent.close();
this.callEvent = null;
this.closed = true;
}
Expand Down