Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-4896 : Read-only proxy targets initialized from second-level cache are not read-only 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18759 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Gail Badner 2010-02-10 07:03:48 +00:00
parent b39918f247
commit 6abbd54e8e
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
View File

@ -635,8 +635,9 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i
session.instantiate( subclassPersister, id ) : optionalObject; session.instantiate( subclassPersister, id ) : optionalObject;
// make it circular-reference safe // make it circular-reference safe
EntityKey entityKey = new EntityKey( id, subclassPersister, session.getEntityMode() );
TwoPhaseLoad.addUninitializedCachedEntity( TwoPhaseLoad.addUninitializedCachedEntity(
new EntityKey( id, subclassPersister, session.getEntityMode() ), entityKey,
result, result,
subclassPersister, subclassPersister,
LockMode.NONE, LockMode.NONE,
@ -659,12 +660,21 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i
if ( log.isTraceEnabled() ) log.trace( "Cached Version: " + version ); if ( log.isTraceEnabled() ) log.trace( "Cached Version: " + version );
final PersistenceContext persistenceContext = session.getPersistenceContext(); final PersistenceContext persistenceContext = session.getPersistenceContext();
boolean isReadOnly = session.isDefaultReadOnly();
if ( persister.isMutable() ) {
Object proxy = persistenceContext.getProxy( entityKey );
if ( proxy != null ) {
// there is already a proxy for this impl
// only set the status to read-only if the proxy is read-only
isReadOnly = ( ( HibernateProxy ) proxy ).getHibernateLazyInitializer().isReadOnly();
}
}
else {
isReadOnly = true;
}
persistenceContext.addEntry( persistenceContext.addEntry(
result, result,
( session.isDefaultReadOnly() || ! persister.isMutable() ? ( isReadOnly ? Status.READ_ONLY : Status.MANAGED ),
Status.READ_ONLY :
Status.MANAGED
),
values, values,
null, null,
id, id,