Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv16010
Modified Files:
Tag: MMBase-1_8
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.200.2.8
retrieving revision 1.200.2.9
diff -u -b -r1.200.2.8 -r1.200.2.9
--- MMBase.java 8 Oct 2007 16:10:24 -0000 1.200.2.8
+++ MMBase.java 11 Mar 2008 16:49:43 -0000 1.200.2.9
@@ -46,7 +46,7 @@
* @author Pierre van Rooden
* @author Johannes Verelst
* @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.200.2.8 2007/10/08 16:10:24 michiel Exp $
+ * @version $Id: MMBase.java,v 1.200.2.9 2008/03/11 16:49:43 michiel Exp $
*/
public class MMBase extends ProcessorModule {
@@ -435,9 +435,9 @@
rootBuilder = null;
mmbaseCop = null;
clusterBuilder = null;
- mmbaseroot = null;
org.mmbase.util.ThreadPools.shutdown();
org.mmbase.core.event.EventManager.getInstance().shutdown();
+ mmbaseroot = null;
}
/**
@@ -1128,12 +1128,23 @@
log.debug("Builder '" + builderName + "' is already loaded");
return builder;
}
-
try {
// 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);
@@ -1148,7 +1159,8 @@
} else {
newclass = MMObjectBuilder.class;
}
- log.error(cnfe.toString() + " (for " +
parser.getClassName() + ") Falling back to " + newclass.getName());
+ log.error(cnfe.toString() + " (for builder '" + ipath +
builderName + "'" +
+ " with class " + parser.getClassName() + ")
Falling back to " + newclass.getName());
}
builder = (MMObjectBuilder)newclass.newInstance();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
