Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unbreak Configuration.mergeProperties() 

I broke this two years ago, but nobody ever noticed since it has no callers
This commit is contained in:
Gavin King 2024-11-24 09:54:08 +01:00
parent b8ed5ad185
commit 204f53d3ba
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -1268,18 +1268,22 @@ public class Configuration {
}
/**
* Adds the incoming properties to the internal properties structure, as
* long as the internal structure does not already contain an entry for
* the given key.
* Adds the incoming properties to the internal properties structure,
* as long as the internal structure does <em>not</em> already contain
* an entry for the given key. If a given property is already set in
* this {@code Configuration}, ignore the setting specified in the
* argument {@link Properties} object.
*
* @apiNote You're probably looking for {@link #addProperties(Properties)}.
*
* @param properties The properties to merge
*
* @return {@code this} for method chaining
*/
public Configuration mergeProperties(Properties properties) {
for ( Map.Entry<Object,Object> entry : properties.entrySet() ) {
if ( !properties.containsKey( entry.getKey() ) ) {
properties.setProperty( (String) entry.getKey(), (String) entry.getValue() );
for ( String property : properties.stringPropertyNames() ) {
if ( !this.properties.containsKey( property ) ) {
this.properties.setProperty( property, properties.getProperty( property ) );
}
}
return this;