Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1452 Configurations attempts to modiy an umodifiable map. Add null checks back in to match 1.2/1.3 branches. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@897284 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-01-08 18:23:07 +00:00
parent 6710465b7c
commit 3065f2febb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -675,6 +675,8 @@ public class Configurations {
* possible configuration prefix. * possible configuration prefix.
*/ */
public static Object removeProperty(String partialKey, Map props) { public static Object removeProperty(String partialKey, Map props) {
if (partialKey == null || props == null || props.isEmpty())
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