Author: michiel
Date: 2010-05-31 13:52:56 +0200 (Mon, 31 May 2010)
New Revision: 42329

Modified:
   
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
Log:
don't generate entities for collections, I can't image it being used, and it's 
certainly not worth the trouble. 

Modified: 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
       2010-05-31 10:10:26 UTC (rev 42328)
+++ 
mmbase/branches/MMBase-1_9/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
       2010-05-31 11:52:56 UTC (rev 42329)
@@ -210,7 +210,11 @@
             Set<Map.Entry<?,?>> map = ((Map) o).entrySet();
             for (Map.Entry<?,?> entry : map) {
                 Object value = entry.getValue();
-                if (value != null && 
Casting.isStringRepresentable(value.getClass()) && entry.getKey() instanceof 
String) {
+                if (value != null &&
+                    Casting.isStringRepresentable(value.getClass()) &&
+                    (!Collection.class.isAssignableFrom(value.getClass())) && 
// collection can be string resentable, but their entries can not be,
+                                                                              
// and they are hardly useful in XML.
+                    entry.getKey() instanceof String) {
                     sb.append("<!ENTITY ");
                     sb.append(prefix);
                     sb.append('.');

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to