From 6710465b7c66b61222d7c034022a143c93586225 Mon Sep 17 00:00:00 2001 From: Donald Woods Date: Fri, 8 Jan 2010 17:23:24 +0000 Subject: [PATCH] OPENJPA-1452 Configurations attempts to modiy an umodifiable map. Patch contributed by JIRA uid baboune. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@897269 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/openjpa/lib/conf/Configurations.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java index b3d6ea24f..46a1899be 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java @@ -675,10 +675,10 @@ public class Configurations { * possible configuration prefix. */ public static Object removeProperty(String partialKey, Map props) { - if (partialKey == null || props == null || props.isEmpty()) - return null; - String fullKey = ProductDerivations.getConfigurationKey(partialKey, props); - return props.remove(fullKey); + if (containsProperty(partialKey, props)) + return props.remove(ProductDerivations.getConfigurationKey(partialKey, props)); + else + return null; } /**