openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r897284 - /openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
Date Fri, 08 Jan 2010 18:23:07 GMT
Author: dwoods
Date: Fri Jan  8 18:23:07 2010
New Revision: 897284

URL: http://svn.apache.org/viewvc?rev=897284&view=rev
Log:
OPENJPA-1452 Configurations attempts to modiy an umodifiable map.  Add null checks back in
to match 1.2/1.3 branches.

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=897284&r1=897283&r2=897284&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  8 18:23:07 2010
@@ -675,6 +675,8 @@
      * 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 



Mime
View raw message