Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv1191
Modified Files:
Tag: MMBase-1_8
UtilReader.java
Log Message:
Ported from HEAD, to fix MMB-1568
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1568
Index: UtilReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/UtilReader.java,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -b -r1.25.2.3 -r1.25.2.4
--- UtilReader.java 24 Jul 2008 16:16:32 -0000 1.25.2.3
+++ UtilReader.java 24 Nov 2008 17:32:09 -0000 1.25.2.4
@@ -34,7 +34,7 @@
* @since MMBase-1.6.4
* @author Rob Vermeulen
* @author Michiel Meeuwissen
- * @version $Id: UtilReader.java,v 1.25.2.3 2008/07/24 16:16:32 michiel Exp $
+ * @version $Id: UtilReader.java,v 1.25.2.4 2008/11/24 17:32:09 michiel Exp $
*/
public class UtilReader {
@@ -209,8 +209,16 @@
Element p = (Element) iter.next();
String name = reader.getElementAttributeValue(p,
"name");
String type = reader.getElementAttributeValue(p,
"type");
- if (type.equals("map")) {
- Collection entryList = new ArrayList();
+ if (type.equals("mergingmap") ||
+ type.equals("map")) {
+ Collection entryList = null;
+ if (type.equals("mergingmap")) {
+ entryList = (Collection) maps.get(name);
+ }
+ if (entryList == null) {
+ entryList = new ArrayList();
+ }
+
for (Iterator entriesIter =
reader.getChildElements(p, "entry"); entriesIter.hasNext();) {
Element entry = (Element) entriesIter.next();
@@ -229,7 +237,7 @@
entryList.add(new Entry(key, value));
}
}
- if (maps.containsKey(name)) {
+ if (maps.containsKey(name) && !
type.equals("mergingmap")) {
log.debug("Property '" + name + "' (" +
entryList + ") of " + url + " is shadowed");
} else {
maps.put(name, entryList);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
