HHH-13433 HHH-13737 (5.3) #3100
Merged
Conversation
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
gbadner
force-pushed
the
HHH-13433_HHH-13737_5.3
branch
from
8d66a78
to
34fcf8f
Compare
…ondition if there is an active JTA transaction, otherwise ORM should throw throw convert( e, lockOptions )
gbadner
force-pushed
the
HHH-13433_HHH-13737_5.3
branch
from
34fcf8f
to
80cb8d2
Compare
scottmarlow
reviewed
Nov 14, 2019
| // Just log the exception and return null. | ||
| if ( log.isDebugEnabled() ) { | ||
| log.debug( "JDBCException was thrown for a transaction marked for rollback; " + | ||
| "this is probably due to IronJacamar failing fast after " + |
There was a problem hiding this comment.
Would it be okay to generalize the logged message to not mention IronJacamar, in case IronJacamar is not in use, perhaps something like:
log.debug( "JDBCException was thrown for a transaction marked for rollback; " +
"this is probably due to an operation failing fast due to " +
"transaction marked for rollback.", e );
There was a problem hiding this comment.
@scottmarlow , yes, good idea; I'll do that.
I see there's a checkstyle failure, so I'll fix that as well.
|
@scottmarlow , I just pushed a commit with the change you requested, and a fix for the checkstyle failure. |
scottmarlow
approved these changes
Nov 14, 2019
|
Looks good! :) |
|
@scottmarlow , thanks Scott! I'll leave this one open until it's approved for 5.3 branch. I'll port the HHH-13737 to master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://hibernate.atlassian.net/browse/HHH-13433
https://hibernate.atlassian.net/browse/HHH-13737
Once approved, the same test case and logging will get pushed to master.