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

HHH-9204 HHH-9205 : Restore AbstractCollectionPersister.doProcessQueuedOps() removed by HHH-9078; deprecate method added by HHH-9078 

(cherry picked from commit 420296fd26)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
This commit is contained in:
Gail Badner 2014-05-19 14:55:18 -07:00
parent 436206356f
commit 75a84220d3
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
View File

@ -1639,9 +1639,27 @@ public abstract class AbstractCollectionPersister
doProcessQueuedOps( collection, key, nextIndex, session );
}
}
protected abstract void doProcessQueuedOps(PersistentCollection collection, Serializable key,
int nextIndex, SessionImplementor session) throws HibernateException;
/**
* 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;
public CollectionMetadata getCollectionMetadata() {
return this;

3
hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java
View File

@ -154,8 +154,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
}

6
hibernate-core/src/main/java/org/hibernate/persister/collection/OneToManyPersister.java
View File

@ -192,9 +192,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,