SAXEventSink.java: Ignore XML entities in start/ end entity callbacks.

2005-05-25  Chris Burdess  <dog@gnu.org>

	* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
	end entity callbacks.

From-SVN: r100163

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index be3a5351fd5727347fda01ca0dfe9d88a3d0b2ea..717747ed97217c91560922e64acabf884695f83f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-25  Chris Burdess  <dog@gnu.org>
+
+       * gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+       end entity callbacks.
+
 2005-05-24  Gary Benson  <gbenson@redhat.com>
 
        PR libgcj/21736:

diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.java b/libjava/gnu/xml/dom/ls/SAXEventSink.java
index 60b99d49305474a999ec365dc2c7b1c10408c9a1..2ff41910dd91f8a8962f4b189df4877e14b6ae0a 100644 (file)
--- a/libjava/gnu/xml/dom/ls/SAXEventSink.java
+++ b/libjava/gnu/xml/dom/ls/SAXEventSink.java
@@ -366,6 +366,14 @@ class SAXEventSink
         ctx = doctype;
         return;
       }
+    if ("lt".equals(name) ||
+        "gt".equals(name) ||
+        "amp".equals(name) ||
+        "apos".equals(name) ||
+        "quot".equals(name))
+      {
+        return;
+      }
     // Get entity
     NamedNodeMap entities = doctype.getEntities();
     Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@ class SAXEventSink
         // Ignore DTD and parameter entities
         return;
       }
+    if ("lt".equals(name) ||
+        "gt".equals(name) ||
+        "amp".equals(name) ||
+        "apos".equals(name) ||
+        "quot".equals(name))
+      {
+        return;
+      }
+    // Get entity
     Entity entity = popEntity();
     // TODO resolve external entities to ensure that entity has content
     if (expandEntityReferences)