From bd8e7e37f0a5182ea1132561bb38d76133846d8d Mon Sep 17 00:00:00 2001 From: Gail Badner Date: Thu, 26 May 2011 16:10:22 -0700 Subject: [PATCH] HHH-6267 : Minor fixes for Plumb MetadataImplementor into service initiators --- .../org/hibernate/internal/SessionFactoryImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index f356db973a..0f520a19f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -183,7 +183,7 @@ public final class SessionFactoryImpl private final transient Map namedQueries; private final transient Map namedSqlQueries; private final transient Map sqlResultSetMappings; - private final transient Map filters; + private final transient Map filters; private final transient Map fetchProfiles; private final transient Map imports; private final transient Interceptor interceptor; @@ -207,6 +207,7 @@ public final class SessionFactoryImpl private final transient TypeHelper typeHelper; private final transient TransactionEnvironment transactionEnvironment; + @SuppressWarnings( {"unchecked"} ) public SessionFactoryImpl( Configuration cfg, Mapping mapping, @@ -233,7 +234,7 @@ public final class SessionFactoryImpl this.typeResolver = cfg.getTypeResolver().scope( this ); this.typeHelper = new TypeLocatorImpl( typeResolver ); - this.filters = new HashMap(); + this.filters = new HashMap(); this.filters.putAll( cfg.getFilterDefinitions() ); LOG.debugf("Session factory constructed with filter configurations : %s", filters); @@ -561,7 +562,10 @@ public final class SessionFactoryImpl this.typeResolver = metadata.getTypeResolver().scope( this ); this.typeHelper = new TypeLocatorImpl( typeResolver ); - this.filters = new HashMap( metadata.getFilterDefinitions() ); + this.filters = new HashMap(); + for ( FilterDefinition filterDefinition : metadata.getFilterDefinitions() ) { + filters.put( filterDefinition.getFilterName(), filterDefinition ); + } LOG.debugf("Session factory constructed with filter configurations : %s", filters); LOG.debugf("Instantiating session factory with properties: %s", configurationService.getSettings() );