HHH-10017 - Bytecode enhancer - consistent handling of persistent attributes (field / property access)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedSetterMethodImpl.java

@@ -45,8 +45,12 @@ public void set(Object target, Object value, SessionFactoryImplementor factory)
 			// for enhanced attribute, don't flag as dirty
 			if ( target instanceof SelfDirtinessTracker ) {
 				( (SelfDirtinessTracker) target ).$$_hibernate_suspendDirtyTracking( true );
-				setterMethod.invoke( target, value );
-				( (SelfDirtinessTracker) target ).$$_hibernate_suspendDirtyTracking( false );
+				try {
+					setterMethod.invoke( target, value );
+				}
+				finally {
+					( (SelfDirtinessTracker) target ).$$_hibernate_suspendDirtyTracking( false );
+				}
 			}
 			else {
 				setterMethod.invoke( target, value );