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

HHH-4948 : Session.flush() does not always cascade save or update to read-only or immutable entities 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18866 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Gail Badner 2010-02-24 00:11:24 +00:00
parent 003658834d
commit 863f6a8fb7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java
View File

@ -92,7 +92,8 @@ public class DefaultAutoFlushEventListener extends AbstractFlushingEventListener
private boolean flushMightBeNeeded(final EventSource source) { private boolean flushMightBeNeeded(final EventSource source) {
return !source.getFlushMode().lessThan(FlushMode.AUTO) && return !source.getFlushMode().lessThan(FlushMode.AUTO) &&
source.getDontFlushFromFind() == 0 && source.getDontFlushFromFind() == 0 &&
source.getPersistenceContext().hasNonReadOnlyEntities(); ( source.getPersistenceContext().getEntityEntries().size() > 0 ||
source.getPersistenceContext().getCollectionEntries().size() > 0 );
} }
} }

3
core/src/main/java/org/hibernate/event/def/DefaultFlushEventListener.java
View File

@ -44,7 +44,8 @@ public class DefaultFlushEventListener extends AbstractFlushingEventListener imp
*/ */
public void onFlush(FlushEvent event) throws HibernateException { public void onFlush(FlushEvent event) throws HibernateException {
final EventSource source = event.getSession(); final EventSource source = event.getSession();
if ( source.getPersistenceContext().hasNonReadOnlyEntities() ) { if ( source.getPersistenceContext().getEntityEntries().size() > 0 ||
source.getPersistenceContext().getCollectionEntries().size() > 0 ) {
flushEverythingToExecutions(event); flushEverythingToExecutions(event);
performExecutions(source); performExecutions(source);

2
testsuite/src/test/java/org/hibernate/test/immutable/ImmutableTest.java
View File

@ -280,7 +280,6 @@ public class ImmutableTest extends FunctionalTestCase {
// c was loaded into s, so it should be read-only // c was loaded into s, so it should be read-only
assertTrue( s.isReadOnly( c ) ); assertTrue( s.isReadOnly( c ) );
c.setCustomerName("foo bar"); c.setCustomerName("foo bar");
c.getVariations().add( new ContractVariation(3, c) );
cv1 = (ContractVariation) c.getVariations().iterator().next(); cv1 = (ContractVariation) c.getVariations().iterator().next();
cv1.setText("blah blah"); cv1.setText("blah blah");
// cv1 and cv2 were loaded into s by hibernate, so they should be read-only // cv1 and cv2 were loaded into s by hibernate, so they should be read-only
@ -350,7 +349,6 @@ public class ImmutableTest extends FunctionalTestCase {
// c was loaded into s, so it should be read-only // c was loaded into s, so it should be read-only
assertTrue( s.isReadOnly( c ) ); assertTrue( s.isReadOnly( c ) );
c.setCustomerName("foo bar"); c.setCustomerName("foo bar");
c.getVariations().add( new ContractVariation(3, c) );
cv1 = (ContractVariation) c.getVariations().iterator().next(); cv1 = (ContractVariation) c.getVariations().iterator().next();
cv1.setText("blah blah"); cv1.setText("blah blah");
// cv1 and cv2 were loaded into s by hibernate, so they should be read-only // cv1 and cv2 were loaded into s by hibernate, so they should be read-only