cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/modules/input XMLFileModule.java
Date Thu, 04 Mar 2004 22:12:57 GMT
haul        2004/03/04 14:12:57

  Modified:    src/java/org/apache/cocoon/components/modules/input
                        XMLFileModule.java
  Log:
  learn the difference of AND and OR ... :-(
  
  Revision  Changes    Path
  1.15      +13 -11    cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
  
  Index: XMLFileModule.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XMLFileModule.java	22 Feb 2004 18:07:16 -0000	1.14
  +++ XMLFileModule.java	4 Mar 2004 22:12:57 -0000	1.15
  @@ -328,16 +328,18 @@
           boolean reload = this.reloadAll;
           boolean cache = this.cacheAll;
           boolean hasDynamicConf = false; // whether we have a <file src="..."> dynamic
configuration
  -        Configuration fileConf = null; // the nested <file>, if any
  -        if (modeConf != null) {
  -            fileConf = modeConf.getChild("file", false);
  -            if (fileConf == null) {
  -                if (getLogger().isDebugEnabled()) {
  -                    getLogger().debug("Missing 'file' child element at "+modeConf.getLocation());
  -                }
  -            } else {
  -                hasDynamicConf = true;
  -            }
  +        Configuration fileConf = null;  // the nested <file>, if any
  +
  +        if (modeConf != null && modeConf.getChildren().length > 0) {
  +        	fileConf = modeConf.getChild("file", false);
  +        	if (fileConf == null) {
  +        		if (this.getLogger().isDebugEnabled()) {
  +        			this.getLogger().debug("Missing 'file' child element at " + modeConf.getLocation());
  +        		}
  +        		
  +        	} else {
  +        		hasDynamicConf = true;
  +        	}
           }
   
           if (hasDynamicConf) {
  
  
  

Mime
View raw message