HHH-6862 final polish

Sanne · stliu · commit 7781cb0aa9d8 · 2011-11-30T11:39:55.000+08:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
@@ -112,7 +112,7 @@ public class StatefulPersistenceContext implements PersistenceContext {
 	private Map<Object, PersistentCollection> arrayHolders;
 
 	// Identity map of CollectionEntry instances, by the collection wrapper
-	private Map<PersistentCollection, CollectionEntry> collectionEntries;
+	private IdentityMap<PersistentCollection, CollectionEntry> collectionEntries;
 
 	// Collection wrappers, by the CollectionKey
 	private Map<CollectionKey, PersistentCollection> collectionsByKey;
@@ -223,8 +223,7 @@ public void clear() {
 			final LazyInitializer li = ((HibernateProxy) o).getHibernateLazyInitializer();
 			li.unsetSession();
 		}
-		Map.Entry<PersistentCollection, CollectionEntry>[] collectionEntryArray = IdentityMap.concurrentEntries( collectionEntries );
-		for ( Map.Entry<PersistentCollection, CollectionEntry> aCollectionEntryArray : collectionEntryArray ) {
+		for ( Map.Entry<PersistentCollection, CollectionEntry> aCollectionEntryArray : IdentityMap.concurrentEntries( collectionEntries ) ) {
 			aCollectionEntryArray.getKey().unsetSession( getSession() );
 		}
 		arrayHolders.clear();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
@@ -90,7 +90,7 @@ public static <K,V> Map.Entry<K,V>[] concurrentEntries(Map<K,V> map) {
 		return ( (IdentityMap<K,V>) map ).entryArray();
 	}
 
-	public static <K,V> Iterator<K> keyIterator(Map<K,V> map) {
+	public static <K,V> Iterator<K> keyIterator(IdentityMap<K,V> map) {
 		return ( (IdentityMap<K,V>) map ).keyIterator();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static <K,V> Map.Entry<K,V>[] concurrentEntries(Map<K,V> map) {`
`90`	`90`	`return ( (IdentityMap<K,V>) map ).entryArray();`
`91`	`91`	`}`
`92`	`92`
`93`		`- public static <K,V> Iterator<K> keyIterator(Map<K,V> map) {`
	`93`	`+ public static <K,V> Iterator<K> keyIterator(IdentityMap<K,V> map) {`
`94`	`94`	`return ( (IdentityMap<K,V>) map ).keyIterator();`
`95`	`95`	`}`
`96`	`96`