From 3065f2febb333b4680ccd5649ece87dc2592afa9 Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Fri, 8 Jan 2010 18:23:07 +0000
Subject: [PATCH] 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
---
 .../main/java/org/apache/openjpa/lib/conf/Configurations.java   | 2 ++
 1 file changed, 2 insertions(+)

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 46a1899be..213301108 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,6 +675,8 @@ public class Configurations {
      * possible configuration prefix.
      */
     public static Object removeProperty(String partialKey, Map props) {
+        if (partialKey == null || props == null || props.isEmpty())
+            return null;
  	if (containsProperty(partialKey, props))
 	    return props.remove(ProductDerivations.getConfigurationKey(partialKey, props));
 	else