Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-02-23 10:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-498. Resolve this by not removing if the prop is not set; the prop in question is only ever set internally anyways when EMF pooling is enabled.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@613332 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2008-01-19 00:55:19 +00:00
parent 7f797f0226
commit 92d1334e52
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,8 +656,11 @@ 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;
return props.remove(ProductDerivations.getConfigurationKey(partialKey, if (containsProperty(partialKey, props))
props)); return props.remove(ProductDerivations.getConfigurationKey(
partialKey, props));
else
return null;
} }
/** /**