Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv12512
Modified Files:
MMBase.java
Log Message:
'weight' goes before version of the builder
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMBase.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMBase.java,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -b -r1.258 -r1.259
--- MMBase.java 3 Oct 2008 09:44:20 -0000 1.258
+++ MMBase.java 12 Nov 2008 17:08:04 -0000 1.259
@@ -45,7 +45,7 @@
* @author Pierre van Rooden
* @author Johannes Verelst
* @author Ernst Bunders
- * @version $Id: MMBase.java,v 1.258 2008/10/03 09:44:20 michiel Exp $
+ * @version $Id: MMBase.java,v 1.259 2008/11/12 17:08:04 michiel Exp $
*/
public class MMBase extends ProcessorModule {
@@ -921,6 +921,7 @@
public BuilderReader getBuilderReader(String builderName) {
try {
BuilderReader r = null;
+ int urlWeight;
String protocol = null;
for (java.net.URL url :
getBuilderLoader().getResourceList(builderName + ".xml")) {
if (! url.openConnection().getDoInput()) {
@@ -935,17 +936,25 @@
}
org.w3c.dom.Document doc = ResourceLoader.getDocument(url,
true, BuilderReader.class);
BuilderReader prop = new BuilderReader(doc, this);
+ int proposalWeight = ResourceLoader.getWeight(url);
prop.setSystemId(url.toString());
if (r == null) {
r = prop;
+ urlWeight = ResourceLoader.getWeight(r);
protocol = url.getProtocol();
- } else if (prop.getVersion() > r.getVersion()) {
+ } else if (urlWeight == proposalWeight && prop.getVersion() >
r.getVersion()) {
log.service(url.toString() + " has a higher version than "
+ r.getSystemId() + " so, using that in stead");
r = prop;
} else {
+ if (proposalWeight > urlWeight) {
+ log.warn("The weight of the proposal is bigger. This
should never happen");
+ } else if (proposalWeight < urlWeight) {
+ log.service(url.toString() + " has a lower weight than
" + r.getSystemId() + ". Ignoring it.");
+ } else {
log.service(url.toString() + " has a lower or equals
version than " + r.getSystemId() + ". Ignoring it.");
}
}
+ }
if (r != null) {
log.debug("Found " + r.getSystemId());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
