Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv15890
Modified Files:
MMBase.java
Log Message:
MMB-1622
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
See also: http://www.mmbase.org/jira/browse/MMB-1622
Index: MMBase.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMBase.java,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- MMBase.java 22 Feb 2008 11:43:39 -0000 1.235
+++ MMBase.java 11 Mar 2008 16:48:02 -0000 1.236
@@ -44,7 +44,7 @@
* @author Pierre van Rooden
* @author Johannes Verelst
* @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.235 2008/02/22 11:43:39 michiel Exp $
+ * @version $Id: MMBase.java,v 1.236 2008/03/11 16:48:02 michiel Exp $
*/
public class MMBase extends ProcessorModule {
@@ -1017,7 +1017,16 @@
// register the loading of this builder
loading.add(builderName);
BuilderReader parser = getBuilderReader(ipath + builderName);
- if (parser == null) return null;
+ if (parser == null) {
+ loading.remove(builderName);
+ return null;
+ }
+ if (! parser.getRootElement().getTagName().equals("builder")) {
+ log.service(ipath + builderName + " does not represent a
builder xml. Because the root element is not 'builder' but " +
parser.getRootElement().getTagName() + ". This file is ignored.");
+ loading.remove(builderName);
+ return null;
+ }
+
String status = parser.getStatus();
if (status.equals("active")) {
log.service("Starting builder: " + builderName);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
