<!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: #333; 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: 0pt; mso-table-rspace: 0pt; background-color: #f5f5f5; border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<!-- header here -->
<tr>
<td id="header-pattern-container" style="padding: 0px; border-collapse: collapse; padding: 10px 20px">
<table id="header-pattern" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="header-avatar-image-container" valign="top" style="padding: 0px; border-collapse: collapse; vertical-align: top; width: 32px; padding-right: 8px"> <img id="header-avatar-image" class="image_fix" src="https://secure.gravatar.com/avatar/64c64d5c042f3bcfc3d0e844284c3f59?d=mm&s=48" height="32" width="32" border="0" style="border-radius: 3px; vertical-align: top" />
</td>
<td id="header-text-container" valign="middle" style="padding: 0px; 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="tuomas_kiviaho" id="email_tuomas_kiviaho" href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?name=tuomas_kiviaho" style="color:#6c797f;; color: #3b73af; text-decoration: none">Tuomas Kiviaho</a> <strong>commented</strong> on <a href="https://hibernate.atlassian.net/browse/HHH-10245" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-avatar-fc6dc07c-ef94-4b94-8b71-0ad96bd41c69" height="16" width="16" border="0" align="absmiddle" alt="Bug" /> HHH-10245</a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="email-content-container" style="padding: 0px; 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: 0pt; mso-table-rspace: 0pt; border-spacing: 0; border-collapse: separate">
<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: 0px; border-collapse: collapse; color: #fff; padding: 0 15px 0 16px; height: 15px; background-color: #fff; border-left: 1px solid #ccc; border-top: 1px solid #ccc; border-right: 1px solid #ccc; 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">
</td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff">
<table class="page-title-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td style="vertical-align: top;; padding: 0px; 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-10245" style="color: #3b73af; text-decoration: none">Re: SelfDirtinessTracker not found</a> </span>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="text-paragraph-pattern-top" class="email-content-main mobile-expand comment-top-pattern" style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff; border-bottom: none; padding-bottom: 0">
<table class="text-paragraph-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 2px">
<tr>
<td class="text-paragraph-pattern-container mobile-resize-text " style="padding: 0px; border-collapse: collapse; padding: 0 0 10px 0">
<p style="margin: 10px 0 0 0"><tt>CompositeEnhancer</tt> and <tt>PersistentAttributesEnhancer</tt> do have also potential for similar exception but my problem is first and foremost with <tt>EntityEnhancer</tt> so here's a patch how I worked around this issue.</p>
<div class="code panel" style="border-width: 1px;; border: 1px solid #ccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #ccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeHeader panelHeader" style="border-bottom-width: 1px;; border-bottom: 1px solid #ccc; padding: 9px 12px">
<b>org/hibernate/bytecode/enhance/spi/Enhancer.java</b>
</div>
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
@@ -102,7 +102,7 @@
<span class="code-keyword" style="color: #000091">return</span> classPool;
}
- <span class="code-keyword" style="color: #000091">private</span> CtClass loadCtClassFromClass(ClassPool cp, <span class="code-object" style="color: #910091">Class</span><?> aClass) <span class="code-keyword" style="color: #000091">throws</span> IOException {
+ <span class="code-keyword" style="color: #000091">protected</span> CtClass loadCtClassFromClass(ClassPool cp, <span class="code-object" style="color: #910091">Class</span><?> aClass) <span class="code-keyword" style="color: #000091">throws</span> IOException {
<span class="code-object" style="color: #910091">String</span> resourceName = aClass.getName().replace( '.', '/' ) + <span class="code-quote" style="color: #009100">".class"</span>;
InputStream resourceAsStream = aClass.getClassLoader().getResourceAsStream( resourceName );
<span class="code-keyword" style="color: #000091">try</span> {
</pre>
</div>
</div>
<div class="code panel" style="border-width: 1px;; border: 1px solid #ccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #ccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeHeader panelHeader" style="border-bottom-width: 1px;; border-bottom: 1px solid #ccc; padding: 9px 12px">
<b>org/hibernate/bytecode/enhance/internal/EntityEnhancer.java</b>
</div>
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
@@ -6,6 +6,7 @@
*/
<span class="code-keyword" style="color: #000091">package</span> org.hibernate.bytecode.enhance.internal;
+<span class="code-keyword" style="color: #000091">import</span> java.io.IOException;
<span class="code-keyword" style="color: #000091">import</span> java.util.Collection;
<span class="code-keyword" style="color: #000091">import</span> java.util.LinkedList;
<span class="code-keyword" style="color: #000091">import</span> java.util.List;
@@ -36,8 +37,20 @@
*/
<span class="code-keyword" style="color: #000091">public</span> class EntityEnhancer <span class="code-keyword" style="color: #000091">extends</span> Enhancer {
+ <span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">final</span> CtClass selfDirtinessTrackerCtClass;
+ <span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">final</span> CtClass dirtyTrackerCtClass;
+ <span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">final</span> CtClass collectionTrackerCtClass;
+
<span class="code-keyword" style="color: #000091">public</span> EntityEnhancer(EnhancementContext context) {
<span class="code-keyword" style="color: #000091">super</span>( context );
+ <span class="code-keyword" style="color: #000091">try</span> {
+ <span class="code-keyword" style="color: #000091">this</span>.selfDirtinessTrackerCtClass = loadCtClassFromClass( classPool, SelfDirtinessTracker.class );
+ <span class="code-keyword" style="color: #000091">this</span>.dirtyTrackerCtClass = loadCtClassFromClass( classPool, DirtyTracker.class );
+ <span class="code-keyword" style="color: #000091">this</span>.collectionTrackerCtClass = loadCtClassFromClass( classPool, CollectionTracker.class );
+ }
+ <span class="code-keyword" style="color: #000091">catch</span> (IOException e) {
+ <span class="code-keyword" style="color: #000091">throw</span> <span class="code-keyword" style="color: #000091">new</span> EnhancementException( <span class="code-quote" style="color: #009100">"Could not prepare Javassist ClassPool"</span>, e );
+ }
}
<span class="code-comment" style="color: #808080">// assuming the number of fields is not very high, SimpleFieldTracker implementation it's the fastest
</span>@@ -109,25 +122,20 @@
}
<span class="code-keyword" style="color: #000091">private</span> void addInLineDirtyHandling(CtClass managedCtClass) {
- <span class="code-keyword" style="color: #000091">try</span> {
- managedCtClass.addInterface( classPool.get( SelfDirtinessTracker.class.getName() ) );
+ managedCtClass.addInterface( <span class="code-keyword" style="color: #000091">this</span>.selfDirtinessTrackerCtClass );
FieldWriter.addField(
managedCtClass,
- classPool.get( DirtyTracker.class.getName() ),
+ <span class="code-keyword" style="color: #000091">this</span>.dirtyTrackerCtClass,
EnhancerConstants.TRACKER_FIELD_NAME
);
FieldWriter.addField(
managedCtClass,
- classPool.get( CollectionTracker.class.getName() ),
+ <span class="code-keyword" style="color: #000091">this</span>.collectionTrackerCtClass,
EnhancerConstants.TRACKER_COLLECTION_NAME
);
createDirtyTrackerMethods( managedCtClass );
- }
- <span class="code-keyword" style="color: #000091">catch</span> (NotFoundException nfe) {
- nfe.printStackTrace();
- }
}
<span class="code-keyword" style="color: #000091">private</span> void createDirtyTrackerMethods(CtClass managedCtClass) {
</pre>
</div>
</div>
<div class="code panel" style="border-width: 1px;; border: 1px solid #ccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #ccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeHeader panelHeader" style="border-bottom-width: 1px;; border-bottom: 1px solid #ccc; padding: 9px 12px">
<b>org/hibernate/bytecode/enhance/internal/CompositeEnhancer.java</b>
</div>
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
@@ -8,9 +8,12 @@
<span class="code-keyword" style="color: #000091">import</span> javassist.CannotCompileException;
<span class="code-keyword" style="color: #000091">import</span> javassist.CtClass;
-<span class="code-keyword" style="color: #000091">import</span> javassist.NotFoundException;
+
+<span class="code-keyword" style="color: #000091">import</span> java.io.IOException;
+
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.EnhancementContext;
+<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.EnhancementException;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.Enhancer;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.EnhancerConstants;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.spi.CompositeOwner;
@@ -23,8 +26,18 @@
*/
<span class="code-keyword" style="color: #000091">public</span> class CompositeEnhancer <span class="code-keyword" style="color: #000091">extends</span> Enhancer {
+ <span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">final</span> CtClass compositeTrackerCtClass;
+ <span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">final</span> CtClass compositeOwnerTrackerCtClass;
+
<span class="code-keyword" style="color: #000091">public</span> CompositeEnhancer(EnhancementContext context) {
<span class="code-keyword" style="color: #000091">super</span>( context );
+ <span class="code-keyword" style="color: #000091">try</span> {
+ <span class="code-keyword" style="color: #000091">this</span>.compositeTrackerCtClass = loadCtClassFromClass( classPool, CompositeTracker.class );
+ <span class="code-keyword" style="color: #000091">this</span>.compositeOwnerTrackerCtClass = loadCtClassFromClass( classPool, CompositeOwnerTracker.class );
+ }
+ <span class="code-keyword" style="color: #000091">catch</span> (IOException e) {
+ <span class="code-keyword" style="color: #000091">throw</span> <span class="code-keyword" style="color: #000091">new</span> EnhancementException( <span class="code-quote" style="color: #009100">"Could not prepare Javassist ClassPool"</span>, e );
+ }
}
<span class="code-keyword" style="color: #000091">public</span> void enhance(CtClass managedCtClass) {
@@ -43,17 +56,11 @@
/* --- */
<span class="code-keyword" style="color: #000091">private</span> void addInLineDirtyHandling(CtClass managedCtClass) {
- <span class="code-keyword" style="color: #000091">try</span> {
- managedCtClass.addInterface( classPool.get( CompositeTracker.class.getName() ) );
+ managedCtClass.addInterface( compositeTrackerCtClass );
- <span class="code-keyword" style="color: #000091">final</span> CtClass compositeCtType = classPool.get( CompositeOwnerTracker.class.getName() );
- FieldWriter.addField( managedCtClass, compositeCtType, EnhancerConstants.TRACKER_COMPOSITE_FIELD_NAME );
+ FieldWriter.addField( managedCtClass, compositeOwnerTrackerCtClass, EnhancerConstants.TRACKER_COMPOSITE_FIELD_NAME );
createCompositeTrackerMethod( managedCtClass );
- }
- <span class="code-keyword" style="color: #000091">catch</span> (NotFoundException nfe) {
- nfe.printStackTrace();
- }
}
<span class="code-keyword" style="color: #000091">private</span> void createCompositeTrackerMethod(CtClass managedCtClass) {
</pre>
</div>
</div>
<div class="code panel" style="border-width: 1px;; border: 1px solid #ccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #ccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeHeader panelHeader" style="border-bottom-width: 1px;; border-bottom: 1px solid #ccc; padding: 9px 12px">
<b>org/hibernate/bytecode/enhance/internal/PersistentAttributesEnhancer.java</b>
</div>
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
@@ -6,6 +6,7 @@
*/
<span class="code-keyword" style="color: #000091">package</span> org.hibernate.bytecode.enhance.internal;
+<span class="code-keyword" style="color: #000091">import</span> java.io.IOException;
<span class="code-keyword" style="color: #000091">import</span> java.util.IdentityHashMap;
<span class="code-keyword" style="color: #000091">import</span> java.util.LinkedList;
<span class="code-keyword" style="color: #000091">import</span> java.util.List;
@@ -31,6 +32,7 @@
<span class="code-keyword" style="color: #000091">import</span> javassist.bytecode.stackmap.MapMaker;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.Hibernate;
+<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.EnhancementContext;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.EnhancementException;
<span class="code-keyword" style="color: #000091">import</span> org.hibernate.bytecode.enhance.spi.Enhancer;
@@ -48,9 +50,17 @@
<span class="code-keyword" style="color: #000091">public</span> class PersistentAttributesEnhancer <span class="code-keyword" style="color: #000091">extends</span> Enhancer {
<span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">static</span> <span class="code-keyword" style="color: #000091">final</span> CoreMessageLogger log = CoreLogging.messageLogger( PersistentAttributesEnhancer.class );
+
+ <span class="code-keyword" style="color: #000091">private</span> <span class="code-keyword" style="color: #000091">final</span> CtClass compositeOwnerCtClass;
<span class="code-keyword" style="color: #000091">public</span> PersistentAttributesEnhancer(EnhancementContext context) {
<span class="code-keyword" style="color: #000091">super</span>( context );
+ <span class="code-keyword" style="color: #000091">try</span> {
+ <span class="code-keyword" style="color: #000091">this</span>.compositeOwnerCtClass = loadCtClassFromClass( classPool, CompositeOwner.class );
+ }
+ <span class="code-keyword" style="color: #000091">catch</span> (IOException e) {
+ <span class="code-keyword" style="color: #000091">throw</span> <span class="code-keyword" style="color: #000091">new</span> EnhancementException( <span class="code-quote" style="color: #009100">"Could not prepare Javassist ClassPool"</span>, e );
+ }
}
<span class="code-keyword" style="color: #000091">public</span> void enhance(CtClass managedCtClass) {
@@ -421,7 +431,7 @@
}
<span class="code-comment" style="color: #808080">// make sure to add the CompositeOwner <span class="code-keyword" style="color: #000091; color: #808080">interface</span>
</span>- managedCtClass.addInterface( classPool.get( CompositeOwner.class.getName() ) );
+ managedCtClass.addInterface( compositeOwnerCtClass );
<span class="code-keyword" style="color: #000091">if</span> ( enhancementContext.isCompositeClass( managedCtClass ) ) {
<span class="code-comment" style="color: #808080">// <span class="code-keyword" style="color: #000091; color: #808080">if</span> a composite have a embedded field we need to implement the TRACKER_CHANGER_NAME method as well</span>
</pre>
</div>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff">
<table id="actions-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px">
<tr>
<td id="actions-pattern-container" valign="middle" style="padding: 0px; border-collapse: collapse; padding: 10px 0 10px 24px; vertical-align: middle; padding-left: 0">
<table align="left" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td class="actions-pattern-action-icon-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 0px; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-10245#add-comment" 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-4f69286c-0595-47bd-969d-813ece7b26b0" 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: 0px; 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-10245#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none">Add Comment</a>
</td>
</tr>
</table>
</td>
</tr>
</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: 0px; border-collapse: collapse; color: #fff; padding: 0 15px 0 16px; height: 5px; line-height: 5px; background-color: #fff; border-top: 0; border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; mso-line-height-rule: exactly">
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="footer-pattern" style="padding: 0px; border-collapse: collapse; padding: 12px 20px">
<table id="footer-pattern-container" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="footer-pattern-text" class="mobile-resize-text" width="100%" style="padding: 0px; border-collapse: collapse; color: #999; 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">(v7.0.0-OD-08-005#70107-<span title="5fb2f7e0c016d05ff672e1e32fcd963de6cf92ae" data-commit-id="5fb2f7e0c016d05ff672e1e32fcd963de6cf92ae}">sha1:5fb2f7e</span>)</span>
</td>
<td id="footer-pattern-logo-desktop-container" valign="top" style="padding: 0px; border-collapse: collapse; padding-left: 20px; vertical-align: top">
<table style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="footer-pattern-logo-desktop-padding" style="padding: 0px; border-collapse: collapse; padding-top: 3px"> <img id="footer-pattern-logo-desktop" src="cid:jira-generated-image-static-footer-desktop-logo-5d43b3ed-f51f-4b7f-b8a2-9dea29190c36" alt="Atlassian logo" title="Atlassian logo" width="169" height="36" class="image_fix" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>