geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r562012 - /geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
Date Thu, 02 Aug 2007 04:00:00 GMT
Author: gawor
Date: Wed Aug  1 20:59:59 2007
New Revision: 562012

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

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

Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java?view=diff&rev=562012&r1=562011&r2=562012
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationOverride.java
Wed Aug  1 20:59:59 2007
@@ -143,11 +143,11 @@
         Element module = doc.createElement("module");
         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");
         }
 
         // GBeans



Mime
View raw message