Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-03-06 08:29:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-428: Revert Changes

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1384463 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jody Grassel 2012-09-13 18:37:49 +00:00
parent f75a9b4375
commit a3e0a52f10
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
View File

@ -665,7 +665,6 @@ public class ConfigurationImpl
// <prefix>.properties System property; remove that property so we // <prefix>.properties System property; remove that property so we
// we don't warn about it // we don't warn about it
Configurations.removeProperty("properties", remaining); Configurations.removeProperty("properties", remaining);
Configurations.removeProperty("Id", remaining, map);
// now warn if there are any remaining properties that there // now warn if there are any remaining properties that there
// is an unhandled prop, and remove the unknown properties // is an unhandled prop, and remove the unknown properties

14
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
View File

@ -693,16 +693,10 @@ public class Configurations {
public static Object removeProperty(String partialKey, Map props) { public static Object removeProperty(String partialKey, Map props) {
if (partialKey == null || props == null || props.isEmpty()) if (partialKey == null || props == null || props.isEmpty())
return null; return null;
if (containsProperty(partialKey, props)) if (containsProperty(partialKey, props))
return props.remove(ProductDerivations.getConfigurationKey(partialKey, props)); return props.remove(ProductDerivations.getConfigurationKey(partialKey, props));
else else
return null; return null;
}
public static void removeProperty(String partialKey, Map<?,?> remaining, Map<?,?> props) {
if (removeProperty(partialKey, remaining) != null) {
removeProperty(partialKey, props);
}
} }
/** /**