From 518d58e6b04a01707af8997f806c3672744db8a3 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 30 Nov 2016 14:16:13 -0500
Subject: [PATCH] HHH-11294 - NPE in
 org.hibernate.jpa.internal.util.PersistenceUtilHelper.isInitialized(PersistentAttributeInterceptable)

---
 .../internal/util/PersistenceUtilHelper.java  |  2 +-
 .../util/PersistenceUtilHelperTest.java       | 78 +++++++++++++++----
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java
index 9cba90dd17..04f1791044 100644
--- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java
+++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java
@@ -94,7 +94,7 @@ public final class PersistenceUtilHelper {
 	@SuppressWarnings("SimplifiableIfStatement")
 	private static boolean isInitialized(PersistentAttributeInterceptable interceptable) {
 		final LazyAttributeLoadingInterceptor interceptor = extractInterceptor( interceptable );
-		return interceptable == null || !interceptor.hasAnyUninitializedAttributes();
+		return interceptable == null || interceptor == null || !interceptor.hasAnyUninitializedAttributes();
 	}
 
 	private static LazyAttributeLoadingInterceptor extractInterceptor(PersistentAttributeInterceptable interceptable) {
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/userguide/util/PersistenceUtilHelperTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/userguide/util/PersistenceUtilHelperTest.java
index eb55c68e58..f595083e76 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/userguide/util/PersistenceUtilHelperTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/userguide/util/PersistenceUtilHelperTest.java
@@ -8,17 +8,20 @@ package org.hibernate.userguide.util;
 
 import javax.persistence.spi.LoadState;
 
-import org.junit.Test;
-
+import org.hibernate.engine.spi.PersistentAttributeInterceptable;
+import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.jpa.internal.util.PersistenceUtilHelper;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
+
 /**
  * Tests for HHH-5094 and HHH-5334
  *
  * @author Hardy Ferentschik
  */
-public class PersistenceUtilHelperTest{
+public class PersistenceUtilHelperTest {
 	private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
 
 	public static class FieldAccessBean extends FieldAccessBeanBase {
@@ -50,51 +53,96 @@ public class PersistenceUtilHelperTest{
 			return publicAccessProperty;
 		}
 	}
-    @Test
+
+	@Test
 	public void testIsLoadedWithReferencePublicField() {
 		assertEquals(
 				LoadState.UNKNOWN,
-				PersistenceUtilHelper.isLoadedWithReference( new FieldAccessBean(), "publicAccessProperty", cache )
+				PersistenceUtilHelper.isLoadedWithReference(
+						new FieldAccessBean(),
+						"publicAccessProperty",
+						cache
+				)
 		);
 	}
-    @Test
+
+	@Test
 	public void testIsLoadedWithReferencePublicMethod() {
 		assertEquals(
 				LoadState.UNKNOWN,
 				PersistenceUtilHelper.isLoadedWithReference(
-						new MethodAccessBean(), "publicAccessPropertyValue", cache
+						new MethodAccessBean(),
+						"publicAccessPropertyValue",
+						cache
 				)
 		);
 	}
-   @Test
+
+	@Test
 	public void testIsLoadedWithReferenceProtectedField() {
 		assertEquals(
 				LoadState.UNKNOWN,
-				PersistenceUtilHelper.isLoadedWithReference( new FieldAccessBean(), "protectedAccessProperty", cache )
+				PersistenceUtilHelper.isLoadedWithReference(
+						new FieldAccessBean(),
+						"protectedAccessProperty",
+						cache
+				)
 		);
 	}
-    @Test
+
+	@Test
 	public void testIsLoadedWithReferenceProtectedMethod() {
 		assertEquals(
 				LoadState.UNKNOWN,
 				PersistenceUtilHelper.isLoadedWithReference(
-						new MethodAccessBean(), "protectedAccessPropertyValue", cache
+						new MethodAccessBean(),
+						"protectedAccessPropertyValue",
+						cache
 				)
 		);
 	}
-    @Test
+
+	@Test
 	public void testIsLoadedWithReferencePrivateField() {
 		assertEquals(
 				LoadState.UNKNOWN,
-				PersistenceUtilHelper.isLoadedWithReference( new FieldAccessBean(), "privateAccessProperty", cache )
+				PersistenceUtilHelper.isLoadedWithReference(
+						new FieldAccessBean(),
+						"privateAccessProperty",
+						cache
+				)
 		);
 	}
-    @Test
+
+	@Test
 	public void testIsLoadedWithReferencePrivateMethod() {
 		assertEquals(
 				LoadState.UNKNOWN,
 				PersistenceUtilHelper.isLoadedWithReference(
-						new MethodAccessBean(), "privateAccessPropertyValue", cache
+						new MethodAccessBean(),
+						"privateAccessPropertyValue",
+						cache
+				)
+		);
+	}
+
+	@Test
+	public void testIsLoadedWithNullInterceptor() {
+		assertEquals(
+				LoadState.LOADED,
+				PersistenceUtilHelper.isLoaded(
+						new PersistentAttributeInterceptable() {
+
+							@Override
+							public PersistentAttributeInterceptor $$_hibernate_getInterceptor() {
+								return null;
+							}
+
+							@Override
+							public void $$_hibernate_setInterceptor(PersistentAttributeInterceptor interceptor) {
+
+							}
+						}
 				)
 		);
 	}