HHH-8032 OptimisticLockException with message of the wrapped
StaleObjectStateException Conflicts: hibernate-entitymanager/src/main/java/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
This commit is contained in:
parent
f7b80fb28c
commit
3d932aeb33
|
@ -1410,22 +1410,22 @@ public abstract class AbstractEntityManagerImpl implements HibernateEntityManage
|
||||||
Object entity = getRawSession().load( sose.getEntityName(), identifier );
|
Object entity = getRawSession().load( sose.getEntityName(), identifier );
|
||||||
if ( entity instanceof Serializable ) {
|
if ( entity instanceof Serializable ) {
|
||||||
//avoid some user errors regarding boundary crossing
|
//avoid some user errors regarding boundary crossing
|
||||||
pe = new OptimisticLockException( null, e, entity );
|
pe = new OptimisticLockException( e.getMessage(), e, entity );
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
pe = new OptimisticLockException( e );
|
pe = new OptimisticLockException( e.getMessage(), e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch ( EntityNotFoundException enfe ) {
|
catch ( EntityNotFoundException enfe ) {
|
||||||
pe = new OptimisticLockException( e );
|
pe = new OptimisticLockException( e.getMessage(), e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
pe = new OptimisticLockException( e );
|
pe = new OptimisticLockException( e.getMessage(), e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
pe = new OptimisticLockException( e );
|
pe = new OptimisticLockException( e.getMessage(), e );
|
||||||
}
|
}
|
||||||
return pe;
|
return pe;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue