You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/10/08 00:06:25 UTC

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

Author: jdillon
Date: Sat Oct  7 15:06:25 2006
New Revision: 454034

URL: http://svn.apache.org/viewvc?view=rev&rev=454034
Log:
(GERONIMO-2463) Only write out the condition if it is non-null and not an empty string

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=454034&r1=454033&r2=454034
==============================================================================
--- 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 Sat Oct  7 15:06:25 2006
@@ -139,7 +139,7 @@
         if (!load) {
             module.setAttribute("load", "false");
         }
-        if (condition != null) {
+        if (condition != null && condition.trim().length() != 0) {
             module.setAttribute("condition", condition);
         }