Author: michiel
Date: 2009-11-18 10:57:41 +0100 (Wed, 18 Nov 2009)
New Revision: 39758

Modified:
   mmbase/trunk/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
Log:
in dtd's I think also %-signs must be escaped

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/util/xml/EntityResolver.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/xml/EntityResolver.java     
2009-11-18 09:18:38 UTC (rev 39757)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/xml/EntityResolver.java     
2009-11-18 09:57:41 UTC (rev 39758)
@@ -210,7 +210,7 @@
                     String k = identifier.transform((String) entry.getKey());
                     k = k.replaceAll("\\s", "");
                     sb.append(k);
-                    sb.append(" \"" + 
org.mmbase.util.transformers.Xml.XMLAttributeEscape("" + value, '"') + "\">\n");
+                    sb.append(" \"" + 
org.mmbase.util.transformers.Xml.XMLAttributeEscape("" + value, 
'"').replaceAll("%", "%") + "\">\n");
                 }
                 if (level < 3 && value != null && !os.contains(value) && ! 
value.getClass().getName().startsWith("java.lang")) { // recursion to acces 
also properties of this
                     appendEntities(sb, value, prefix + "." + entry.getKey(), 
level + 1, os);
@@ -236,7 +236,7 @@
                                     sb.append(prefix);
                                     sb.append('.');
                                     camelAppend(sb, name.substring(3));
-                                    sb.append(" \"" + 
org.mmbase.util.transformers.Xml.XMLAttributeEscape("" + value, '"') + "\">\n");
+                                    sb.append(" \"" + 
org.mmbase.util.transformers.Xml.XMLAttributeEscape("" + value, 
'"').replaceAll("%", "&#x25;") + "\">\n");
                                 }
                             }
                             if (! rt.getName().startsWith("java.lang")) {

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to