geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r509879 - in /geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition: JexlConditionParser.java OgnlConditionParser.java
Date Wed, 21 Feb 2007 03:44:00 GMT
Author: jdillon
Date: Tue Feb 20 19:43:59 2007
New Revision: 509879

URL: http://svn.apache.org/viewvc?view=rev&rev=509879
Log:
Properties.containsKey() does not include keys from defaults, so just copy all elements from
System.properties into a new Properties objects so it behaves

Modified:
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java?view=diff&rev=509879&r1=509878&r2=509879
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
Tue Feb 20 19:43:59 2007
@@ -53,8 +53,9 @@
         vars.put("os", new OsVariable());
         
         // Install properties (to allow getProperty(x,y) to be used for defaults
-        // Using nested defaults to avoid modifications to system props in expresssion
-        vars.put("props", new Properties(System.getProperties()));
+        Properties props = new Properties();
+        props.putAll(System.getProperties());
+        vars.put("props", props);
     }
 
     /**

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java?view=diff&rev=509879&r1=509878&r2=509879
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
Tue Feb 20 19:43:59 2007
@@ -53,8 +53,9 @@
         vars.put("os", new OsVariable());
         
         // Install properties (to allow getProperty(x,y) to be used for defaults
-        // Using nested defaults to avoid modifications to system props in expresssion
-        vars.put("props", new Properties(System.getProperties()));
+        Properties props = new Properties();
+        props.putAll(System.getProperties());
+        vars.put("props", props);
     }
     
     /**



Mime
View raw message