From 420296fd267c8bcf9501896fcc17446c55b1d272 Mon Sep 17 00:00:00 2001 From: Gail Badner Date: Mon, 19 May 2014 14:55:18 -0700 Subject: [PATCH] HHH-9204 HHH-9205 : Restore AbstractCollectionPersister.doProcessQueuedOps() removed by HHH-9078; deprecate method added by HHH-9078 --- .../AbstractCollectionPersister.java | 19 ++++++++++++++++++- .../collection/BasicCollectionPersister.java | 3 +-- .../collection/OneToManyPersister.java | 6 +++--- 3 files changed, 22 insertions(+), 6 deletions(-) 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 651cb56ebf..f62e7c6b3b 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 @@ -1708,8 +1708,25 @@ public abstract class AbstractCollectionPersister } } - protected abstract void doProcessQueuedOps(PersistentCollection collection, Serializable key, + /** + * Process queued operations within the PersistentCollection. + * + * @param collection The collection + * @param key The collection key + * @param nextIndex The next index to write + * @param session The session + * @throws HibernateException + * + * @deprecated Use {@link #doProcessQueuedOps(org.hibernate.collection.spi.PersistentCollection, java.io.Serializable, org.hibernate.engine.spi.SessionImplementor)} + */ + @Deprecated + protected void doProcessQueuedOps(PersistentCollection collection, Serializable key, int nextIndex, SessionImplementor session) + throws HibernateException { + doProcessQueuedOps( collection, key, session ); + } + + protected abstract void doProcessQueuedOps(PersistentCollection collection, Serializable key, SessionImplementor session) throws HibernateException; @Override diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java index add87aacd9..c0b7582a2b 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java @@ -155,8 +155,7 @@ public class BasicCollectionPersister extends AbstractCollectionPersister { } @Override - protected void doProcessQueuedOps(PersistentCollection collection, Serializable id, - int nextIndex, SessionImplementor session) + protected void doProcessQueuedOps(PersistentCollection collection, Serializable id, SessionImplementor session) throws HibernateException { // nothing to do } 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 370db27754..85f9f12245 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 @@ -193,9 +193,9 @@ public class OneToManyPersister extends AbstractCollectionPersister { } @Override - protected void doProcessQueuedOps(PersistentCollection collection, Serializable id, - int nextIndex, SessionImplementor session) throws HibernateException { - writeIndex( collection, collection.queuedAdditionIterator(), id, nextIndex, session ); + protected void doProcessQueuedOps(PersistentCollection collection, Serializable id, SessionImplementor session) + throws HibernateException { + writeIndex( collection, collection.queuedAdditionIterator(), id, getSize( id, session ), session ); } private void writeIndex(PersistentCollection collection, Iterator entries, Serializable id,