geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r562001 - /geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
Date Thu, 02 Aug 2007 02:46:18 GMT
Author: gawor
Date: Wed Aug  1 19:46:17 2007
New Revision: 562001

URL: http://svn.apache.org/viewvc?view=rev&rev=562001
Log:
prefer condition attribute over load attribute (GERONIMO-3365)

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

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java?view=diff&rev=562001&r1=562000&r2=562001
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
Wed Aug  1 19:46:17 2007
@@ -177,12 +177,10 @@
         root.appendChild(module);
         module.setAttribute("name", name.toString());
 
-        if (! load) {
-            module.setAttribute("load", "false");
-        }
-
         if (condition != null && condition.trim().length() != 0) {
             module.setAttribute("condition", condition);
+        } else if (!load) {
+            module.setAttribute("load", "false");
         }
 
         if (comment != null && comment.trim().length() > 0) {



Mime
View raw message