HHH-10119 - EhCacheRegionFactory cannot find configurationResourceName set in .cfg.xml

sebersole · sebersole · commit 8fde7229fea5 · 2015-09-24T11:59:05.000-05:00
(cherry picked from commit 0c628fa)
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/LoadedConfig.java
@@ -156,11 +156,12 @@ private static String trim(String value) {
 
 	@SuppressWarnings("unchecked")
 	private void addConfigurationValue(String propertyName, String value) {
+		value = trim( value );
+		configurationValues.put( propertyName, value );
+
 		if ( !propertyName.startsWith( "hibernate." ) ) {
-			propertyName = "hibernate." + propertyName;
+			configurationValues.put( "hibernate." + propertyName, value );
 		}
-
-		configurationValues.put( propertyName, trim( value ) );
 	}
 
 	private void addMappingReference(MappingReference mappingReference) {

Original file line number	Diff line number	Diff line change
`@@ -156,11 +156,12 @@ private static String trim(String value) {`
`156`	`156`
`157`	`157`	`@SuppressWarnings("unchecked")`
`158`	`158`	`private void addConfigurationValue(String propertyName, String value) {`
	`159`	`+ value = trim( value );`
	`160`	`+ configurationValues.put( propertyName, value );`
	`161`	`+`
`159`	`162`	`if ( !propertyName.startsWith( "hibernate." ) ) {`
`160`		`- propertyName = "hibernate." + propertyName;`
	`163`	`+ configurationValues.put( "hibernate." + propertyName, value );`
`161`	`164`	`}`
`162`		`-`
`163`		`- configurationValues.put( propertyName, trim( value ) );`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`private void addMappingReference(MappingReference mappingReference) {`