[hibernate-commits] Hibernate SVN: r16526 - core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/tuple.

[hibernate-commits at lists.jboss.org]

Author: cbredesen
Date: 2009-05-08 11:48:28 -0400 (Fri, 08 May 2009)
New Revision: 16526

Modified:
   core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/tuple/EntityModeToTuplizerMapping.java
Log:
JBPAPP-1922 / HHH-2645 - Synchronization bottleneck in EntityModeToTuplizerMapping

Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/tuple/EntityModeToTuplizerMapping.java
===================================================================
--- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/tuple/EntityModeToTuplizerMapping.java	2009-05-08 01:12:20 UTC (rev 16525)
+++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/tuple/EntityModeToTuplizerMapping.java	2009-05-08 15:48:28 UTC (rev 16526)
@@ -1,72 +1,78 @@
-package org.hibernate.tuple;
-
-import org.apache.commons.collections.SequencedHashMap;
-
-import org.hibernate.EntityMode;
-import org.hibernate.HibernateException;
-
-import java.util.Map;
-import java.util.Collections;
-import java.util.Iterator;
-import java.io.Serializable;
-
-/**
- * Centralizes handling of {@link EntityMode} to {@link Tuplizer} mappings.
- *
- * @author Steve Ebersole
- */
-public abstract class EntityModeToTuplizerMapping implements Serializable {
-
-	// map of EntityMode -> Tuplizer
-	private final Map tuplizers = Collections.synchronizedMap( new SequencedHashMap() );
-
-	protected void addTuplizer(EntityMode entityMode, Tuplizer tuplizer) {
-		tuplizers.put( entityMode, tuplizer );
-	}
-
-	/**
-	 * Given a supposed instance of an entity/component, guess its entity mode.
-	 *
-	 * @param object The supposed instance of the entity/component.
-	 * @return The guessed entity mode.
-	 */
-	public EntityMode guessEntityMode(Object object) {
-		Iterator itr = tuplizers.entrySet().iterator();
-		while( itr.hasNext() ) {
-			Map.Entry entry = ( Map.Entry ) itr.next();
-			Tuplizer tuplizer = ( Tuplizer ) entry.getValue();
-			if ( tuplizer.isInstance( object ) ) {
-				return ( EntityMode ) entry.getKey();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Locate the contained tuplizer responsible for the given entity-mode.  If
-	 * no such tuplizer is defined on this mapping, then return null.
-	 *
-	 * @param entityMode The entity-mode for which the caller wants a tuplizer.
-	 * @return The tuplizer, or null if not found.
-	 */
-	public Tuplizer getTuplizerOrNull(EntityMode entityMode) {
-		return ( Tuplizer ) tuplizers.get( entityMode );
-	}
-
-	/**
-	 * Locate the tuplizer contained within this mapping which is responsible
-	 * for the given entity-mode.  If no such tuplizer is defined on this
-	 * mapping, then an exception is thrown.
-	 *
-	 * @param entityMode The entity-mode for which the caller wants a tuplizer.
-	 * @return The tuplizer.
-	 * @throws HibernateException Unable to locate the requested tuplizer.
-	 */
-	public Tuplizer getTuplizer(EntityMode entityMode) {
-		Tuplizer tuplizer = getTuplizerOrNull( entityMode );
-		if ( tuplizer == null ) {
-			throw new HibernateException( "No tuplizer found for entity-mode [" + entityMode + "]");
-		}
-		return tuplizer;
-	}
-}
+package org.hibernate.tuple;
+
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.hibernate.EntityMode;
+import org.hibernate.HibernateException;
+import org.hibernate.util.FastHashMap;
+
+/**
+ * Centralizes handling of {@link EntityMode} to {@link Tuplizer} mappings.
+ *
+ * @author Steve Ebersole
+ */
+public abstract class EntityModeToTuplizerMapping implements Serializable {
+
+	// map of EntityMode -> Tuplizer
+	private final Map tuplizers;
+
+	public EntityModeToTuplizerMapping() {
+		tuplizers = new FastHashMap();
+	}
+
+	public EntityModeToTuplizerMapping(Map tuplizers) {
+		this.tuplizers = tuplizers;
+	}
+
+	protected void addTuplizer(EntityMode entityMode, Tuplizer tuplizer) {
+		tuplizers.put( entityMode, tuplizer );
+	}
+
+	/**
+	 * Given a supposed instance of an entity/component, guess its entity mode.
+	 *
+	 * @param object The supposed instance of the entity/component.
+	 * @return The guessed entity mode.
+	 */
+	public EntityMode guessEntityMode(Object object) {
+		Iterator itr = tuplizers.entrySet().iterator();
+		while( itr.hasNext() ) {
+			Map.Entry entry = ( Map.Entry ) itr.next();
+			Tuplizer tuplizer = ( Tuplizer ) entry.getValue();
+			if ( tuplizer.isInstance( object ) ) {
+				return ( EntityMode ) entry.getKey();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Locate the contained tuplizer responsible for the given entity-mode.  If
+	 * no such tuplizer is defined on this mapping, then return null.
+	 *
+	 * @param entityMode The entity-mode for which the caller wants a tuplizer.
+	 * @return The tuplizer, or null if not found.
+	 */
+	public Tuplizer getTuplizerOrNull(EntityMode entityMode) {
+		return ( Tuplizer ) tuplizers.get( entityMode );
+	}
+
+	/**
+	 * Locate the tuplizer contained within this mapping which is responsible
+	 * for the given entity-mode.  If no such tuplizer is defined on this
+	 * mapping, then an exception is thrown.
+	 *
+	 * @param entityMode The entity-mode for which the caller wants a tuplizer.
+	 * @return The tuplizer.
+	 * @throws HibernateException Unable to locate the requested tuplizer.
+	 */
+	public Tuplizer getTuplizer(EntityMode entityMode) {
+		Tuplizer tuplizer = getTuplizerOrNull( entityMode );
+		if ( tuplizer == null ) {
+			throw new HibernateException( "No tuplizer found for entity-mode [" + entityMode + "]");
+		}
+		return tuplizer;
+	}
+}