HHH-6496 - Changed line 200 returning real object instead of proxy

hibernate · Mar 25, 2013 · a0bbf0d · a0bbf0d
1 parent d3867e9
commit a0bbf0d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...rnate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java b/...rnate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java
@@ -197,7 +197,7 @@ public Object invoke(
 						}
 						returnValue = thisMethod.invoke( target, args );
 					}
-					return returnValue == target ? proxy : returnValue;
+					return returnValue == target && returnValue.getClass().isInstance(proxy) ? proxy : returnValue;
 				}
 				catch ( InvocationTargetException ite ) {
 					throw ite.getTargetException();