<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<base href="https://hibernate.atlassian.net">
<title>Message Title</title>
</head>
<body class="jira" style="color: #333333; font-family: Arial, sans-serif; font-size: 14px; line-height: 1.429">
<table id="background-table" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; background-color: #f5f5f5; border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0" bgcolor="#f5f5f5">
<!-- header here -->
<tbody>
<tr>
<td id="header-pattern-container" style="padding: 0; border-collapse: collapse; padding: 10px 20px">
<table id="header-pattern" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td id="header-avatar-image-container" valign="top" style="padding: 0; border-collapse: collapse; vertical-align: top; width: 32px; padding-right: 8px" width="32"> <img id="header-avatar-image" class="image_fix" src="https://avatar-cdn.atlassian.com/6fdbefbff8c445a8a4e37a11f2db1624?s=48&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2F6fdbefbff8c445a8a4e37a11f2db1624%3Fd%3Dmm%26s%3D48%26noRedirect%3Dtrue" height="32" width="32" border="0" style="border-radius: 3px; vertical-align: top"> </td>
<td id="header-text-container" valign="middle" style="padding: 0; border-collapse: collapse; vertical-align: middle; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px"> <a class="user-hover" rel="scott.marlow" style="color:#6c797f;; color: #3b73af; text-decoration: none" id="email_scott.marlow" href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?accountId=557058%3Aff72c345-4c9e-4140-98cc-5cd4fedbdfac"> Scott Marlow </a> <strong>updated</strong> an issue </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="email-content-container" style="padding: 0; border-collapse: collapse; padding: 0 20px">
<table id="email-content-table" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; border-spacing: 0; border-collapse: separate">
<tbody>
<tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<td class="email-content-rounded-top mobile-expand" style="padding: 0; border-collapse: collapse; color: #ffffff; padding: 0 15px 0 16px; height: 15px; background-color: #ffffff; border-left: 1px solid #cccccc; border-top: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom: 0; border-top-right-radius: 5px; border-top-left-radius: 5px; height: 10px; line-height: 10px; padding: 0 15px 0 16px; mso-line-height-rule: exactly" height="10" bgcolor="#ffffff"> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff" bgcolor="#ffffff">
<table class="page-title-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td class="page-title-pattern-first-line " style="padding: 0; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; padding-top: 10px"> <a href="https://hibernate.atlassian.net/browse/HHH?atlOrigin=eyJpIjoiYWM1ZTNmY2I5MjEyNGY1ZGE3MDgyMzI4ZDlkYzk0YzEiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none">Hibernate ORM</a> / <a href="https://hibernate.atlassian.net/browse/HHH-13433?atlOrigin=eyJpIjoiYWM1ZTNmY2I5MjEyNGY1ZGE3MDgyMzI4ZDlkYzk0YzEiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-avatar-8f4702f5-9ab3-4182-bead-bdc8a0b0eb9d" height="16" width="16" border="0" align="absmiddle" alt="Bug" style="vertical-align: text-bottom"></a> <a href="https://hibernate.atlassian.net/browse/HHH-13433?atlOrigin=eyJpIjoiYWM1ZTNmY2I5MjEyNGY1ZGE3MDgyMzI4ZDlkYzk0YzEiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none">HHH-13433</a> </td>
</tr>
<tr>
<td style="vertical-align: top;; padding: 0; border-collapse: collapse; padding-right: 5px; font-size: 20px; line-height: 30px; mso-line-height-rule: exactly" class="page-title-pattern-header-container"> <span class="page-title-pattern-header" style="font-family: Arial, sans-serif; padding: 0; font-size: 20px; line-height: 30px; mso-text-raise: 2px; mso-line-height-rule: exactly; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-13433?atlOrigin=eyJpIjoiYWM1ZTNmY2I5MjEyNGY1ZGE3MDgyMzI4ZDlkYzk0YzEiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none">EntityManager.find() should only check for roll-back-only condition if there is an active JTA transaction, otherwise ORM should throw throw convert( e, lockOptions )</a> </span> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand wrapper-special-margin" style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff; padding-top: 10px; padding-bottom: 5px" bgcolor="#ffffff">
<table class="keyvalue-table" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<th style="color: #707070; font: normal 14px/20px Arial, sans-serif; text-align: left; vertical-align: top; padding: 2px 0">Change By:</th>
<td style="padding: 0; border-collapse: collapse; font: normal 14px/20px Arial, sans-serif; padding: 2px 0 2px 5px; vertical-align: top"> <a class="user-hover" rel="scott.marlow" style="color:#6c797f;; color: #3b73af; text-decoration: none" id="email_scott.marlow" href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?accountId=557058%3Aff72c345-4c9e-4140-98cc-5cd4fedbdfac"> Scott Marlow </a> </td>
</tr>
<tr>
<th style="color: #707070; font: normal 14px/20px Arial, sans-serif; text-align: left; vertical-align: top; padding: 2px 0">Sprint:</th>
<td style="padding: 0; border-collapse: collapse; font: normal 14px/20px Arial, sans-serif; padding: 2px 0 2px 5px; vertical-align: top"> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand issue-description-container" style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff; padding-top: 5px; padding-bottom: 10px" bgcolor="#ffffff">
<table class="text-paragraph-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 2px">
<tbody>
<tr>
<td class="text-paragraph-pattern-container mobile-resize-text " style="padding: 0; border-collapse: collapse; padding: 0 0 10px"> <span class="diffcontext">[HHH-12472] added a check for roll-back-only condition, however, we should first check for active JTA transaction.</span> <span class="diffremovedchars" style="background-color: #ffe7e7; text-decoration:line-through;"> <br></span> <span class="diffaddedchars" style="background-color:#ddfade;"> The reason is that when Hibernate ORM calls accessTransaction().getRollbackOnly(), an ISE exception is immediately thrown by org.hibernate.engine.transaction.internal.TransactionImpl.getRollbackOnly, which is confusing to users, as they called find, which shouldn't throw "IllegalStateException: JPA compliance dictates throwing IllegalStateException when #getRollbackOnly is called on non-active transaction", as the application didn't call #getRollbackOnly.</span> <span class="diffcontext"><br></span> <span class="diffaddedchars" style="background-color:#ddfade;"><br></span> <span class="diffcontext">I suggest a change from:<br>{code}<br> public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockModeType, Map<String, Object> properties) {<br> checkOpen();<br><br> LockOptions lockOptions = null;<br><br> try {<br> getLoadQueryInfluencers().getEffectiveEntityGraph().applyConfiguredGraph( properties );<br><br> final IdentifierLoadAccess<T> loadAccess = byId( entityClass );<br> loadAccess.with( determineAppropriateLocalCacheMode( properties ) );<br><br> if ( lockModeType != null ) {<br> if ( !LockModeType.NONE.equals( lockModeType) ) {<br> checkTransactionNeededForUpdateOperation();<br> }<br> lockOptions = buildLockOptions( lockModeType, properties );<br> loadAccess.with( lockOptions );<br> }<br><br> return loadAccess.load( (Serializable) primaryKey );<br> }<br> catch ( EntityNotFoundException ignored ) {<br> // DefaultLoadEventListener.returnNarrowedProxy may throw ENFE (see HHH-7861 for details),<br> // which find() should not throw. Find() should return null if the entity was not found.<br> if ( log.isDebugEnabled() ) {<br> String entityName = entityClass != null ? entityClass.getName(): null;<br> String identifierValue = primaryKey != null ? primaryKey.toString() : null ;<br> log.ignoringEntityNotFound( entityName, identifierValue );<br> }<br> return null;<br> }<br> catch ( ObjectDeletedException e ) {<br> //the spec is silent about people doing remove() find() on the same PC<br> return null;<br> }<br> catch ( ObjectNotFoundException e ) {<br> //should not happen on the entity itself with get<br> throw new IllegalArgumentException( e.getMessage(), e );<br> }<br> catch ( MappingException | TypeMismatchException | ClassCastException e ) {<br> throw exceptionConverter.convert( new IllegalArgumentException( e.getMessage(), e ) );<br> }<br> catch ( JDBCException e ) {<br> if ( accessTransaction().getRollbackOnly() ) {<br> // assume this is the similar to the WildFly / IronJacamar "feature" described under HHH-12472<br> return null;<br> }<br> else {<br> throw exceptionConverter.convert( e, lockOptions );<br> }<br> }<br> catch ( RuntimeException e ) {<br> throw exceptionConverter.convert( e, lockOptions );<br> }<br> finally {<br> getLoadQueryInfluencers().getEffectiveEntityGraph().clear();<br> }<br> }<br>{code}<br><br>Change instead to:<br>{code}<br> public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockModeType, Map<String, Object> properties) {<br> checkOpen();<br><br> LockOptions lockOptions = null;<br><br> try {<br> getLoadQueryInfluencers().getEffectiveEntityGraph().applyConfiguredGraph( properties );<br><br> final IdentifierLoadAccess<T> loadAccess = byId( entityClass );<br> loadAccess.with( determineAppropriateLocalCacheMode( properties ) );<br><br> if ( lockModeType != null ) {<br> if ( !LockModeType.NONE.equals( lockModeType) ) {<br> checkTransactionNeededForUpdateOperation();<br> }<br> lockOptions = buildLockOptions( lockModeType, properties );<br> loadAccess.with( lockOptions );<br> }<br><br> return loadAccess.load( (Serializable) primaryKey );<br> }<br> catch ( EntityNotFoundException ignored ) {<br> // DefaultLoadEventListener.returnNarrowedProxy may throw ENFE (see HHH-7861 for details),<br> // which find() should not throw. Find() should return null if the entity was not found.<br> if ( log.isDebugEnabled() ) {<br> String entityName = entityClass != null ? entityClass.getName(): null;<br> String identifierValue = primaryKey != null ? primaryKey.toString() : null ;<br> log.ignoringEntityNotFound( entityName, identifierValue );<br> }<br> return null;<br> }<br> catch ( ObjectDeletedException e ) {<br> //the spec is silent about people doing remove() find() on the same PC<br> return null;<br> }<br> catch ( ObjectNotFoundException e ) {<br> //should not happen on the entity itself with get<br> throw new IllegalArgumentException( e.getMessage(), e );<br> }<br> catch ( MappingException | TypeMismatchException | ClassCastException e ) {<br> throw exceptionConverter.convert( new IllegalArgumentException( e.getMessage(), e ) );<br> }<br> catch ( JDBCException e ) {<br> // Note one line change is below. <br> if ( accessTransaction().isActive() && accessTransaction().getRollbackOnly() && accessTransaction().getRollbackOnly() ) {<br> // assume this is the similar to the WildFly / IronJacamar "feature" described under HHH-12472<br> return null;<br> }<br> else {<br> throw exceptionConverter.convert( e, lockOptions );<br> }<br> }<br> catch ( RuntimeException e ) {<br> throw exceptionConverter.convert( e, lockOptions );<br> }<br> finally {<br> getLoadQueryInfluencers().getEffectiveEntityGraph().clear();<br> }<br> }<br>{code}<br><br>I'll try the above change locally and check if the current ORM testsuite still passes (on ORM master branch).</span> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff" bgcolor="#ffffff"> <script type="application/ld+json">
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"description": "View Issue",
"potentialAction": {
"@type": "ViewAction",
"target": "https://hibernate.atlassian.net/browse/HHH-13433?inbox=true&",
"name": "View Issue"
},
"publisher": {
"@type": "Organization",
"name": "Atlassian",
"url": "https://www.atlassian.com"
}
}
</script>
<table id="actions-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px">
<tbody>
<tr>
<td id="actions-pattern-container" valign="middle" style="padding: 0; border-collapse: collapse; padding: 10px 0 10px 24px; vertical-align: middle; padding-left: 0">
<table align="left" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td class="actions-pattern-action-icon-container" style="padding: 0; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 0; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-13433#add-comment?atlOrigin=eyJpIjoiYWM1ZTNmY2I5MjEyNGY1ZGE3MDgyMzI4ZDlkYzk0YzEiLCJwIjoiaiJ9" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none"> <img class="actions-pattern-action-icon-image" src="cid:jira-generated-image-static-comment-icon-33e7b6b3-e9b7-4912-80f0-476ad8591ca9" alt="Add Comment" title="Add Comment" height="16" width="16" border="0" style="vertical-align: middle"> </a> </td>
<td class="actions-pattern-action-text-container" style="padding: 0; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 4px; padding-left: 5px"> <a href="https://hibernate.atlassian.net/browse/HHH-13433#add-comment?atlOrigin=eyJpIjoiYWM1ZTNmY2I5MjEyNGY1ZGE3MDgyMzI4ZDlkYzk0YzEiLCJwIjoiaiJ9" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none">Add Comment</a> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table> </td>
</tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<tr>
<td class="email-content-rounded-bottom mobile-expand" style="padding: 0; border-collapse: collapse; color: #ffffff; padding: 0 15px 0 16px; height: 5px; line-height: 5px; background-color: #ffffff; border-top: 0; border-left: 1px solid #cccccc; border-bottom: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; mso-line-height-rule: exactly" height="5" bgcolor="#ffffff"> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="footer-pattern" style="padding: 0; border-collapse: collapse; padding: 12px 20px">
<table id="footer-pattern-container" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td id="footer-pattern-mobile-separated-links" class="mobile-resize-text" width="100%" colspan="2" style="padding: 0; border-collapse: collapse; color: #999999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px"> Get Jira notifications on your phone! Download the Jira Cloud app for <a href="https://play.google.com/store/apps/details?id=com.atlassian.android.jira.core&referrer=utm_source%3DNotificationLink%26utm_medium%3DEmail" style="color: #3b73af; text-decoration: none">Android</a> or <a href="https://itunes.apple.com/app/apple-store/id1006972087?pt=696495&ct=EmailNotificationLink&mt=8" style="color: #3b73af; text-decoration: none">iOS</a>
<hr> </td>
</tr>
<tr>
<td id="footer-pattern-text" class="mobile-resize-text" width="100%" style="padding: 0; border-collapse: collapse; color: #999999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px"> This message was sent by Atlassian Jira <span id="footer-build-information">(v1001.0.0-SNAPSHOT#100104-<span title="e74401839afd1d2be5e433a87b424508c0665600" data-commit-id="e74401839afd1d2be5e433a87b424508c0665600}">sha1:e744018</span>)</span> </td>
<td id="footer-pattern-logo-desktop-container" valign="top" style="padding: 0; border-collapse: collapse; padding-left: 20px; vertical-align: top">
<table style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td id="footer-pattern-logo-desktop-padding" style="padding: 0; border-collapse: collapse; padding-top: 3px; opacity: 0.150"> <img id="footer-pattern-logo-desktop" src="cid:jira-generated-image-static-footer-desktop-logo-3bd68150-3488-4e80-aa57-1bcdb62c5f0e" alt="Atlassian logo" title="Atlassian logo" width="192" height="24" class="image_fix"> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table>
<img border="0" width="1" height="1" alt="" src="http://atlassian.et.e.sparkpost.com/q/7rmNZUBO-WvfcFFFJOlMww~~/AAAAAQA~/RgRe4Nx9PlcLYXRsYXNzaWFudXNCCgAA_aj_XMrVlZJSIGhpYmVybmF0ZS1pc3N1ZXNAbGlzdHMuamJvc3Mub3JnWAQAAAAE">
</body>
</html>