Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/cfg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13783/src/org/hibernate/cfg
Modified Files:
Environment.java
Log Message:
remove concurrent modfiication exception
Index: Environment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/cfg/Environment.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Environment.java 3 Feb 2006 22:08:24 -0000 1.56
+++ Environment.java 6 Feb 2006 12:30:03 -0000 1.57
@@ -472,6 +472,7 @@
*/
public static void verifyProperties(Properties props) {
Iterator iter = props.keySet().iterator();
+ Map propertiesToAdd = new HashMap();
while ( iter.hasNext() ) {
final Object propertyName = iter.next();
Object newPropertyName = OBSOLETE_PROPERTIES.get( propertyName );
@@ -481,11 +482,12 @@
newPropertyName = RENAMED_PROPERTIES.get( propertyName );
if ( newPropertyName != null ) {
log.warn( "Property [" + propertyName + "] has been renamed to [" + newPropertyName + "]; update your properties appropriately" );
- if ( ! props.containsKey( newPropertyName ) ) {
- props.put( newPropertyName, props.get( propertyName ) );
+ if ( ! props.containsKey( newPropertyName ) ) {
+ propertiesToAdd.put( newPropertyName, props.get( propertyName ) );
}
}
}
+ props.putAll(propertiesToAdd);
}
static {
|
