May 2011 - hibernate-commits - Jboss List Archives

Hibernate SVN: r20942 - entitymanager/branches/v3_3_2_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-05-17 01:14:51 -0400 (Tue, 17 May 2011) New Revision: 20942 Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml Log: JBPAPP-6541 clean db tables after each test Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-05-17 05:13:27 UTC (rev 20941) +++ entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-05-17 05:14:51 UTC (rev 20942) @@ -26,23 +26,13 @@ <property name="build.dir" location="build"/> <property name="classes.dir" location="${build.dir}/classes"/> <property name="testclasses.dir" location="${build.dir}/testclasses"/> -  - <property name="doc.dir" location="doc"/> <property name="doc.api.dir" location="${doc.dir}/api"/> - - <property name="dist.doc.dir" location="${build.dir}/doc"/> <property name="dist.api.dir" location="${dist.doc.dir}/api"/> - -  <property name="jar.name" value="${name}"/> <property name="jar.file.name" value="${build.dir}/${jar.name}.jar"/> <property name="jartest.file.name" value="${build.dir}/${jar.name}-tests.jar"/> - <property name="javadoc" value="http://java.sun.com/j2se/1.5.0/docs/api"/> <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> @@ -50,21 +40,12 @@ <property name="javac.target" value="1.5"/> <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> <property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/> - -  <property name="hibernate-core.home" location="../core"/> <property name="hibernate-core.jar" location="${hibernate-core.home}/build/hibernate3.jar"/> <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/> <property name="resources.dir" value="src/resources"/> <property name="testresources.dir" value="src/test-resources"/> -  <property name="build.testresources.dir" value="${build.dir}/testresources"/> <property name="build.temp.dir" value="${build.dir}/temp"/> <path id="lib.class.path"> @@ -250,11 +231,6 @@ </target> <target name="compiletest" depends="compile" description="Compile the tests"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> <javac srcdir="${test.dir}" destdir="${testclasses.dir}"

12 years, 11 months

1
0
0 / 0

Hibernate SVN: r20941 - in annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations: manytomany and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-05-17 01:13:27 -0400 (Tue, 17 May 2011) New Revision: 20941 Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java Log: JBPAPP-6541 clean db tables after each test Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java 2011-05-16 16:47:48 UTC (rev 20940) +++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/TestCase.java 2011-05-17 05:13:27 UTC (rev 20941) @@ -116,7 +116,9 @@ } } catch ( Throwable e ) { - closeSession( e ); + throw e; + }finally{ + closeSession( ); } } @@ -209,7 +211,7 @@ } } - private void closeSession(Throwable e) throws Throwable { + private void closeSession() { try { if ( session != null && session.isOpen() ) { if ( session.isConnected() ) { @@ -228,7 +230,6 @@ } catch ( Exception ignore ) { } - throw e; } public Session openSession() throws HibernateException { Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2011-05-16 16:47:48 UTC (rev 20940) +++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2011-05-17 05:13:27 UTC (rev 20941) @@ -14,6 +14,9 @@ import org.hibernate.JDBCException; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.test.annotations.TestCase; /** @@ -22,7 +25,6 @@ * @author Emmanuel Bernard */ public class ManyToManyTest extends TestCase { - public ManyToManyTest(String x) { super( x ); } @@ -281,9 +283,12 @@ * * */ -// HHH-3577 +// HHH-3577 JBPAPP-1123 public void testOrderByContractor() throws Exception { - + if(getDialect() instanceof MySQLDialect || getDialect() instanceof PostgreSQLDialect || getDialect() instanceof SQLServerDialect){ + log.warn("skip test testOrderByContractor due to JBPAPP-1123"); + return; + } Session s; Transaction tx; s = openSession(); Modified: annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java =================================================================== --- annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2011-05-16 16:47:48 UTC (rev 20940) +++ annotations/branches/v3_3_1_GA_CP/src/test/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2011-05-17 05:13:27 UTC (rev 20941) @@ -7,12 +7,14 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; -import java.util.Set; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.test.annotations.Customer; import org.hibernate.test.annotations.Discount; import org.hibernate.test.annotations.Passport; @@ -378,8 +380,12 @@ tx.commit(); s.close(); } - + //known issue JBPAPP-1123 HHH-3577 public void testOrderByOnSuperclassProperty() { + if(getDialect() instanceof MySQLDialect || getDialect() instanceof PostgreSQLDialect || getDialect() instanceof SQLServerDialect){ + log.warn("skip test testOrderByContractor due to JBPAPP-1123"); + return; + } OrganisationUser user = new OrganisationUser(); user.setFirstName( "Emmanuel" ); user.setLastName( "Bernard" ); @@ -395,7 +401,7 @@ s.persist( org ); s.flush(); s.clear(); - List l = s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list(); + s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list(); s.getTransaction().rollback(); s.close(); }

12 years, 11 months

1
0
0 / 0

[hibernate/hibernate-core] ab1dca: HHH-6202 Adding InheritanceType enum

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: ab1dca7e8623c18eef03aea33874d628152a4ecf https://github.com/hibernate/hibernate-core/commit/ab1dca7e8623c18eef03ae... Author: Hardy Ferentschik <hardy(a)ferentschik.de> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/binding/AttributeBinding.java M hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java A hibernate-core/src/main/java/org/hibernate/metamodel/binding/InheritanceType.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/EntityBinder.java Log Message: ----------- HHH-6202 Adding InheritanceType enum Commit: 3bef5524832e73192c43df3b8cc79042fed2c12a https://github.com/hibernate/hibernate-core/commit/3bef5524832e73192c43df... Author: Hardy Ferentschik <hardy(a)ferentschik.de> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ColumnValues.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ConfiguredClass.java A hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/DiscriminatorColumnValues.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/EntityBinder.java A hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/IdType.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/MappedAttribute.java Log Message: ----------- HHH-6202 Starting to process the discriminator column Commit: ac0cf3afd816d00b006a299094c37ae1f8744415 https://github.com/hibernate/hibernate-core/commit/ac0cf3afd816d00b006a29... Author: Hardy Ferentschik <hardy(a)ferentschik.de> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/HibernateDotNames.java Log Message: ----------- HHH-6202 Deleting deprecated annotations. Core 4 seems to be a good point to get rid of them. Commit: 5d766b237b23147ee0411862aee5d9d438441c97 https://github.com/hibernate/hibernate-core/commit/5d766b237b23147ee04118... Author: Hardy Ferentschik <hardy(a)ferentschik.de> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/util/JandexHelper.java Log Message: ----------- HHH-6202 Adding new helper method for getting a single annotation instance from a map Commit: 85b0725c2835357d715bf2550c78bad8bfc51bf8 https://github.com/hibernate/hibernate-core/commit/85b0725c2835357d715bf2... Author: Hardy Ferentschik <hardy(a)ferentschik.de> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityBinding.java M hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityDiscriminator.java Log Message: ----------- HHH-6202 Cleanup of existing classes. Replacing TODO with AssertionFailure Commit: cb7eb17caa6da6c231566be32c99aebfa3c995c4 https://github.com/hibernate/hibernate-core/commit/cb7eb17caa6da6c231566b... Author: Hardy Ferentschik <hardy(a)ferentschik.de> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/binding/InheritanceType.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ConfiguredClass.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/ConfiguredClassHierarchy.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/DiscriminatorColumnValues.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/EntityBinder.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/MappedAttribute.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/AbstractEntityBinder.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/state/domain/HbmSimpleAttributeDomainState.java A hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/InheritanceTypeTest.java A hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/RootOfSingleTableInheritance.java A hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/SubclassOfSingleTableInheritance.java M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/TableNameTest.java M hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/util/ConfiguredClassHierarchyBuilderTest.java Log Message: ----------- HHH-6202 Binding discriminator column. Using org.hibernate.metamodel.binding.InheritanceType in ConfiguredClass which has a NO_INHERITANCE enum value. Adding some initial tests Compare: https://github.com/hibernate/hibernate-core/compare/f70f8d7...cb7eb17

12 years, 11 months

1
0
0 / 0

Hibernate SVN: r20940 - core/patches.

by hibernate-commits＠lists.jboss.org

Author: smendenh(a)redhat.com Date: 2011-05-16 12:47:48 -0400 (Mon, 16 May 2011) New Revision: 20940 Added: core/patches/hibernate-3.3.2.GA_CP04_JBPAPP-5730/ Log: one-off patch branch for JBPAPP-5730

12 years, 11 months

1
0
0 / 0

[hibernate/hibernate-core] c6207b: HHH-6223 fix un-isolated test

by noreply＠github.com

Branch: refs/heads/3.6 Home: https://github.com/hibernate/hibernate-core Commit: c6207be3b703a841cf22ae28f99ca9cc79e3f828 https://github.com/hibernate/hibernate-core/commit/c6207be3b703a841cf22ae... Author: Strong Liu <stliu(a)hibernate.org> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-testsuite/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java Log Message: ----------- HHH-6223 fix un-isolated test

12 years, 11 months

1
0
0 / 0

[hibernate/hibernate-core] eddd14: HHH-6224 update mysql jdbc driver version for test...

by noreply＠github.com

Branch: refs/heads/3.6 Home: https://github.com/hibernate/hibernate-core Commit: eddd14b010adaa0b7e79383126036c41e419b01d https://github.com/hibernate/hibernate-core/commit/eddd14b010adaa0b7e7938... Author: Strong Liu <stliu(a)hibernate.org> Date: 2011-05-16 (Mon, 16 May 2011) Changed paths: M hibernate-parent/pom.xml Log Message: ----------- HHH-6224 update mysql jdbc driver version for testing

12 years, 11 months

1
0
0 / 0

Hibernate SVN: r20939 - in core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate: hql/classic and 5 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-05-16 04:00:34 -0400 (Mon, 16 May 2011) New Revision: 20939 Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/collection/AbstractPersistentCollection.java core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/hql/classic/WhereParser.java core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/impl/SessionFactoryObjectFactory.java core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/SingleTableEntityPersister.java core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/pretty/Formatter.java 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/util/FastHashMap.java core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/SoftLimitMRUCache.java Log: JBPAPP-6526 HHH-3050 Convert usage of Hibernate's FastHashMap to ConcurrentHashMap (Java 1.5) Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/collection/AbstractPersistentCollection.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/collection/AbstractPersistentCollection.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/collection/AbstractPersistentCollection.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -119,7 +119,7 @@ if ( hasQueuedOperations() ) { session.flush(); } - return new Boolean( persister.indexExists( entry.getLoadedKey(), index, session ) ); + return persister.indexExists( entry.getLoadedKey(), index, session ); } } read(); @@ -136,7 +136,7 @@ if ( hasQueuedOperations() ) { session.flush(); } - return new Boolean( persister.elementExists( entry.getLoadedKey(), element, session ) ); + return persister.elementExists( entry.getLoadedKey(), element, session ); } } read(); Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/hql/classic/WhereParser.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/hql/classic/WhereParser.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/hql/classic/WhereParser.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -254,7 +254,7 @@ } if ( lcToken.equals( "not" ) ) { - nots.addLast( new Boolean( !( ( Boolean ) nots.removeLast() ).booleanValue() ) ); + nots.addLast( !( ( Boolean ) nots.removeLast() ).booleanValue() ); negated = !negated; return; //NOTE: early return } Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/impl/SessionFactoryObjectFactory.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/impl/SessionFactoryObjectFactory.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/impl/SessionFactoryObjectFactory.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -4,6 +4,7 @@ import java.util.Hashtable; import java.util.Iterator; import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; import javax.naming.Context; import javax.naming.InvalidNameException; @@ -18,7 +19,6 @@ import javax.naming.spi.ObjectFactory; import org.hibernate.SessionFactory; -import org.hibernate.util.FastHashMap; import org.hibernate.util.NamingHelper; import org.apache.commons.logging.Log; @@ -39,8 +39,8 @@ log.debug("initializing class SessionFactoryObjectFactory"); } - private static final FastHashMap INSTANCES = new FastHashMap(); - private static final FastHashMap NAMED_INSTANCES = new FastHashMap(); + private static final ConcurrentHashMap<String, SessionFactory> INSTANCES = new ConcurrentHashMap<String, SessionFactory>(); + private static final ConcurrentHashMap<String, SessionFactory> NAMED_INSTANCES = new ConcurrentHashMap<String, SessionFactory>(); private static final NamingListener LISTENER = new NamespaceChangeListener() { public void objectAdded(NamingEvent evt) { Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -135,7 +135,7 @@ keyCols[k] = ( (Column) citer.next() ).getQuotedName( factory.getDialect() ); } keyColumns.add(keyCols); - cascadeDeletes.add( new Boolean( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ) ); + cascadeDeletes.add( ( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ) ); } naturalOrderTableNames = ArrayHelper.toStringArray(tables); naturalOrderTableKeyColumns = ArrayHelper.to2DStringArray(keyColumns); @@ -147,7 +147,7 @@ titer = persistentClass.getSubclassTableClosureIterator(); while ( titer.hasNext() ) { Table tab = (Table) titer.next(); - isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassTable(tab) ) ); + isConcretes.add( ( persistentClass.isClassOrSuperclassTable(tab) ) ); String tabname = tab.getQualifiedName( factory.getDialect(), factory.getSettings().getDefaultCatalogName(), Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/SingleTableEntityPersister.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/SingleTableEntityPersister.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/persister/entity/SingleTableEntityPersister.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -228,11 +228,11 @@ joinIter = persistentClass.getSubclassJoinClosureIterator(); while ( joinIter.hasNext() ) { Join join = (Join) joinIter.next(); - isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassJoin(join) ) ); - isDeferreds.add( new Boolean( join.isSequentialSelect() ) ); - isInverses.add( new Boolean( join.isInverse() ) ); - isNullables.add( new Boolean( join.isOptional() ) ); - isLazies.add( new Boolean( lazyAvailable && join.isLazy() ) ); + isConcretes.add( ( persistentClass.isClassOrSuperclassJoin(join) ) ); + isDeferreds.add( ( join.isSequentialSelect() ) ); + isInverses.add( ( join.isInverse() ) ); + isNullables.add( ( join.isOptional() ) ); + isLazies.add( ( lazyAvailable && join.isLazy() ) ); if ( join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin(join) ) hasDeferred = true; subclassTables.add( join.getTable().getQualifiedName( factory.getDialect(), Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/pretty/Formatter.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/pretty/Formatter.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/pretty/Formatter.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -247,8 +247,8 @@ out(); indent++; newline(); - parenCounts.addLast( new Integer(parensSinceSelect) ); - afterByOrFromOrSelects.addLast( new Boolean(afterByOrSetOrFromOrSelect) ); + parenCounts.addLast( parensSinceSelect ); + afterByOrFromOrSelects.addLast( (afterByOrSetOrFromOrSelect) ); parensSinceSelect = 0; afterByOrSetOrFromOrSelect = true; } 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 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/tuple/EntityModeToTuplizerMapping.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -3,10 +3,10 @@ import java.io.Serializable; import java.util.Iterator; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.util.FastHashMap; /** * Centralizes handling of {@link EntityMode} to {@link Tuplizer} mappings. @@ -16,10 +16,11 @@ public abstract class EntityModeToTuplizerMapping implements Serializable { // map of EntityMode -> Tuplizer - private final Map tuplizers; + private final Map<EntityMode,Tuplizer> tuplizers; + public EntityModeToTuplizerMapping() { - tuplizers = new FastHashMap(); + tuplizers = new ConcurrentHashMap<EntityMode,Tuplizer>(); } public EntityModeToTuplizerMapping(Map tuplizers) { @@ -45,6 +46,11 @@ return ( EntityMode ) entry.getKey(); } } + for ( Map.Entry<EntityMode, Tuplizer> entityModeTuplizerEntry : tuplizers.entrySet() ) { + if ( entityModeTuplizerEntry.getValue().isInstance( object ) ) { + return entityModeTuplizerEntry.getKey(); + } + } return null; } @@ -56,7 +62,7 @@ * @return The tuplizer, or null if not found. */ public Tuplizer getTuplizerOrNull(EntityMode entityMode) { - return ( Tuplizer ) tuplizers.get( entityMode ); + return tuplizers.get( entityMode ); } /** Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/FastHashMap.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/FastHashMap.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/FastHashMap.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -82,9 +82,9 @@ * <code>HashMap</code> only within a single thread, you should use * <code>java.util.HashMap</code> directly (with no synchronization), for * maximum performance.</p> - * + *@Deprecated */ - +@Deprecated public final class FastHashMap implements Map, Serializable { // ----------------------------------------------------------- Constructors Modified: core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/SoftLimitMRUCache.java =================================================================== --- core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/SoftLimitMRUCache.java 2011-05-07 12:07:30 UTC (rev 20938) +++ core/branches/Branch_3_2_4_SP1_CP/src/org/hibernate/util/SoftLimitMRUCache.java 2011-05-16 08:00:34 UTC (rev 20939) @@ -93,6 +93,15 @@ } /** + * to keep search compatibility + * @Deprecated + */ + @Deprecated + public SoftLimitMRUCache(int strongRefCount) { + this( strongRefCount, DEFAULT_SOFT_REF_COUNT ); + } + + /** * Constructs a cache with the specified settings. * * @param strongRefCount the strong reference count.

12 years, 11 months

1
0
0 / 0

[hibernate/hibernate-core] 7444a2: HHH-6223 connection leak in entitymanager and anno...

by noreply＠github.com

Branch: refs/heads/3.6 Home: https://github.com/hibernate/hibernate-core Commit: 7444a252ef56b692c0b79bef9d48ad91fc570a3e https://github.com/hibernate/hibernate-core/commit/7444a252ef56b692c0b79b... Author: Strong Liu <stliu(a)hibernate.org> Date: 2011-05-15 (Sun, 15 May 2011) Changed paths: M hibernate-testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java Log Message: ----------- HHH-6223 connection leak in entitymanager and annotation's testsuite

12 years, 11 months

1
0
0 / 0

[hibernate/hibernate-core] f70f8d: HHH-6133 update global configuration override stra...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: f70f8d7101f2b054a134459d6d64f30fda289db1 https://github.com/hibernate/hibernate-core/commit/f70f8d7101f2b054a13445... Author: Strong Liu <stliu(a)hibernate.org> Date: 2011-05-13 (Fri, 13 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java Log Message: ----------- HHH-6133 update global configuration override strategy to make it consisit with previouse version

12 years, 11 months

1
0
0 / 0

[hibernate/hibernate-core] 4e0f6a: HHH-6133 new added list was not put into map in Gl...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: 4e0f6a15780a4515320292137395f5b40fab6275 https://github.com/hibernate/hibernate-core/commit/4e0f6a15780a4515320292... Author: Strong Liu <stliu(a)hibernate.org> Date: 2011-05-12 (Thu, 12 May 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/GlobalAnnotations.java Log Message: ----------- HHH-6133 new added list was not put into map in GlobalAnnotations

12 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits May 2011