Attachment 948676 Details for Bug 1148603 – BZ1148603.patch

[patch] BZ1148603.patch

BZ1148603.patch (text/plain), 2.13 KB, created by Gary Hu on 2014-10-20 19:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Hu

Created: 2014-10-20 19:57:32 UTC

Size: 2.13 KB

patch

obsolete

>diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
>index 47ed495..de64208 100644
>--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
>+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
>@@ -1635,8 +1635,7 @@ public abstract class AbstractCollectionPersister
> 	public void processQueuedOps(PersistentCollection collection, Serializable key, SessionImplementor session)
> 			throws HibernateException {
> 		if ( collection.hasQueuedOperations() ) {
>-			int nextIndex = getSize( key, session );
>-			doProcessQueuedOps( collection, key, nextIndex, session );
>+			doProcessQueuedOps(collection,  key,  session);
> 		}
> 	}
> 
>diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
>index 1448011..5fe59d1 100644
>--- a/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
>+++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
>@@ -194,13 +194,14 @@ public class OneToManyPersister extends AbstractCollectionPersister {
> 	@Override
> 	protected void doProcessQueuedOps(PersistentCollection collection, Serializable id, SessionImplementor session)
> 			throws HibernateException {
>-		writeIndex( collection, collection.queuedAdditionIterator(), id, getSize( id, session ), session );
>+		writeIndex( collection, collection.queuedAdditionIterator(), id, 0, session );
> 	}
> 	
> 	private void writeIndex(PersistentCollection collection, Iterator entries, Serializable id,
> 			int nextIndex, SessionImplementor session) {
> 		// If one-to-many and inverse, still need to create the index.  See HHH-5732.
> 		if ( isInverse && hasIndex && !indexContainsFormula ) {
>+			nextIndex = getSize( id, session );
> 			try {
> 				if ( entries.hasNext() ) {
> 					Expectation expectation = Expectations.appropriateExpectation( getUpdateCheckStyle() );

Actions: View | Diff

Attachments on bug 1148603: 948676