Author: pcl
Date: Fri Jan 18 16:55:19 2008
New Revision: 613332
URL: http://svn.apache.org/viewvc?rev=613332&view=rev
Log:
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.
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java?rev=613332&r1=613331&r2=613332&view=diff
==============================================================================
---
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
(original)
+++
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
Fri Jan 18 16:55:19 2008
@@ -656,8 +656,11 @@
public static Object removeProperty(String partialKey, Map props) {
if (partialKey == null || props == null || props.isEmpty())
return null;
- return props.remove(ProductDerivations.getConfigurationKey(partialKey,
- props));
+ if (containsProperty(partialKey, props))
+ return props.remove(ProductDerivations.getConfigurationKey(
+ partialKey, props));
+ else
+ return null;
}
/**
