<!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/64c64d5c042f3bcfc3d0e844284c3f59?s=48&amp;d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2F64c64d5c042f3bcfc3d0e844284c3f59%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="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-9515" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-avatar-29e288b8-a24e-4d06-9066-6f512c79afcc" height="16" width="16" border="0" align="absmiddle" alt="Bug"> HHH-9515</a> </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">&nbsp;</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 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-9515" style="color: #3b73af; text-decoration: none">Re: OneToOne relation with optional=false is not lazy loaded</a> </span> </td> 
                                                </tr> 
                                            </tbody>
                                        </table> </td> 
                                </tr> 
                                <tr> 
                                    <td id="text-paragraph-pattern-top" class="email-content-main mobile-expand  comment-top-pattern" 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; border-bottom: none; padding-bottom: 0" 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"> <p style="margin: 10px 0 0; margin-top: 0">Here's my workaround. I'm not saying this the the proper approach but at least I'm now avoiding similar situation as what <a href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?name=dave.radtke" class="user-hover" rel="dave.radtke" style="color: #3b73af; text-decoration: none">Dave Radtke</a> explained in <span class="jira-issue-macro" data-jira-key="HHH-11147"> 
                                                                <!-- replace the span with an AUI template --> <a href="https://hibernate.atlassian.net/browse/HHH-11147" class="jira-issue-macro-key issue-link" title="Allow enhanced entities to be returned in a completely uninitialized state" style="color: #3b73af; text-decoration: none"> <img class="icon" src="https://hibernate.atlassian.net/secure/viewavatar?size=xsmall&amp;avatarId=12151&amp;avatarType=issuetype"> HHH-11147 </a> <span class="aui-lozenge aui-lozenge-subtle aui-lozenge-complete jira-macro-single-issue-export-pdf" style="background: #cccccc; border: 1px solid #cccccc; border-radius: 3px; color: #333333; display: inline-block; font-size: 11px; font-weight: bold; line-height: 99%; margin: 0; padding: 2px 5px; text-align: center; text-decoration: none; text-transform: uppercase; background-color: #ffffff; border-color: #cccccc; color: #333333" bgcolor="#ffffff">Open</span> </span> where it's also explained why this - namely <tt>hasProxy()</tt> - doesn't work alone when enhancing is involved. </p> <p style="margin: 10px 0 0">I may have very well overlooked things because <tt>DefaultLoadEventListener.onLoad</tt> does have options like <tt>checkDeleted</tt>, <tt>nakedEntityReturned</tt>, <tt>lockMode</tt> and <tt>allowProxyCreation</tt>, but on the other hand I've found that <tt>unWrapProxy</tt> was not respected. In my opinion these two codebases have so much similarity between them that in he end they should share code.</p> 
                                                        <div class="code panel" style="border-width: 1px;; border: 1px solid #cccccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #cccccc; -moz-border-radius: 3px; border-radius: 3px; margin: 9px 0">
                                                            <div class="codeHeader panelHeader" style="border-bottom-width: 1px;; border-bottom: 1px solid #cccccc; padding: 9px 12px">
                                                                <b>org/hibernate/type/EntityType.java b/src/org/hibernate/type/EntityType.java</b>
                                                            </div>
                                                            <div class="codeContent panelContent" style="padding: 9px 12px"> 
                                                                <pre class="code-java" style="margin: 10px 0 0; margin-top: 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
@@ -16,6 +16,8 @@
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.HibernateException;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.MappingException;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.internal.ForeignKeys;
+<span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.spi.EntityEntry;
+<span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.spi.EntityKey;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.spi.EntityUniqueKey;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.spi.Mapping;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.engine.spi.PersistenceContext;
@@ -26,6 +28,7 @@
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.persister.entity.Joinable;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.persister.entity.UniqueKeyLoadable;
 <span class="code-keyword" style="color: #000091">import</span> org.hibernate.proxy.HibernateProxy;
+<span class="code-keyword" style="color: #000091">import</span> org.hibernate.proxy.LazyInitializer;
 
 /**
  * Base <span class="code-keyword" style="color: #000091">for</span> types which map associations to persistent entities.
@@ -696,16 +699,33 @@
                 <span class="code-keyword" style="color: #000091">final</span> PersistenceContext persistenceContext = session.getPersistenceContext();
                 <span class="code-object" style="color: #910091">Object</span> result = persistenceContext.getEntity( euk );
                 <span class="code-keyword" style="color: #000091">if</span> ( result == <span class="code-keyword" style="color: #000091">null</span> ) {
-                        result = persister.loadByUniqueKey( uniqueKeyPropertyName, key, session );
-                                
-                        <span class="code-comment" style="color: #808080">// If the entity was not in the Persistence Context, but was found now,
</span>-                        <span class="code-comment" style="color: #808080">// add it to the Persistence Context
</span>-                        <span class="code-keyword" style="color: #000091">if</span> (result != <span class="code-keyword" style="color: #000091">null</span>) {
-                                persistenceContext.addEntity(euk, result);
+                        EntityKey entityKey = session.generateEntityKey( (Serializable) key, persister);
+                        result = persistenceContext.getProxy( entityKey );
+                        <span class="code-keyword" style="color: #000091">if</span> ( result == <span class="code-keyword" style="color: #000091">null</span> ) {
+                                <span class="code-keyword" style="color: #000091">if</span> ( persister.hasProxy() ) {
+                                        result = persister.createProxy( (Serializable) key, session );
+                                        persistenceContext.getBatchFetchQueue().addBatchLoadableEntityKey( entityKey );
+                                        persistenceContext.addProxy( entityKey, result );
+                                } <span class="code-keyword" style="color: #000091">else</span> {
+                                        result = persister.loadByUniqueKey( uniqueKeyPropertyName, key, session );
+                                        
+                                                <span class="code-comment" style="color: #808080">// If the entity was not in the Persistence Context, but was found now,
</span>+                                                <span class="code-comment" style="color: #808080">// add it to the Persistence Context
</span>+                                        <span class="code-keyword" style="color: #000091">if</span> (result != <span class="code-keyword" style="color: #000091">null</span>) {
+                                                persistenceContext.addEntity(euk, result);
+                                        }
+                                }
+                        } <span class="code-keyword" style="color: #000091">else</span> {
+                                LazyInitializer li = ( (HibernateProxy) result ).getHibernateLazyInitializer();
+                        <span class="code-keyword" style="color: #000091">if</span> ( li.isUnwrap() ) {
+                                result = li.getImplementation();
+                        } <span class="code-keyword" style="color: #000091">else</span> {
+                                result = persistenceContext.narrowProxy( result, persister, entityKey, <span class="code-keyword" style="color: #000091">null</span>);
+                        }
                         }
                 }
 
-                <span class="code-keyword" style="color: #000091">return</span> result == <span class="code-keyword" style="color: #000091">null</span> ? <span class="code-keyword" style="color: #000091">null</span> : persistenceContext.proxyFor( result );
+                <span class="code-keyword" style="color: #000091">return</span> result;
         }
 
 }
</pre> 
                                                            </div>
                                                        </div> </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-9515?inbox=true&focusedCommentId=100013&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-100013",
    "name": "View Comment"
      },
  "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-9515#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-e06a6388-bf72-4d89-b926-0892e975f1c5" 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-9515#add-comment" 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">&nbsp;</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&amp;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&amp;ct=EmailNotificationLink&amp;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#100063-<span title="5b66ec3df88e21b2aa54c823fbde3b5b251f02aa" data-commit-id="5b66ec3df88e21b2aa54c823fbde3b5b251f02aa}">sha1:5b66ec3</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-a4341c7b-9447-49eb-b10d-6aef6f78ebe5" 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 src="https://u4043402.ct.sendgrid.net/wf/open?upn=YNXLe5Uzuivj8jGpuXra04BSJ-2BS7raa1puTAtyVUP-2F0vngXMYTK-2FS3Irgj0Y-2FFD4ABafS4jxa5Q-2B7DLko7J7hsGTv2z3Aw2E92A1J0Fu3QNJIAW6yqDF3BLVA7ssXl-2BX2RC4QQKT6FxaeWNTlqhaJ8EMXtRIU8T2sCUivSW-2FpMCxf4ESC3nQVjUApln0BhEBDwqjA-2FFtoMkgRUnJfT4q12OwnyaxdRybNMxCaFpWoMKstu-2BqBIUg8S8ByC5BwzUC" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/>
</body>
</html>