Fix handling of messages/errors for empty variables/threads/frames, e.g. for cases like <variables><message></variables>.

Erno Mononen · Erno Mononen · commit 721c20f17d19 · 2009-06-01T20:18:25.000Z
diff --git a/src/org/rubyforge/debugcommons/Util.java b/src/org/rubyforge/debugcommons/Util.java
@@ -266,4 +266,19 @@ public static String getType(final XmlPullParser xpp) {
             return "<Unable to find a type>";
         }
     }
+
+    /**
+     * Checks whether the current state of the given <code>xpp</code> represents
+     * an end tag for the given <code>name</code>.
+     * 
+     * @param xpp
+     * @param name
+     * @return
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    public static boolean isEndTag(XmlPullParser xpp, String name) throws XmlPullParserException, IOException {
+        return XmlPullParser.END_TAG == xpp.getEventType() && name.equals(xpp.getName());
+    }
+
 }
diff --git a/src/org/rubyforge/debugcommons/reader/FramesReader.java b/src/org/rubyforge/debugcommons/reader/FramesReader.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import org.rubyforge.debugcommons.Util;
 import org.rubyforge.debugcommons.model.RubyFrameInfo;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -42,6 +43,15 @@ private void parse() throws XmlPullParserException, IOException {
         assert xpp.getName().equals("frames");
         while (!(nextEvent() == XmlPullParser.END_TAG && "frames".equals(xpp.getName()))) {
             ErrorReader.flushPossibleMessage(xpp);
+            /*
+             * Check for empty <frames>, e.g.:
+             * <frames>
+             * <message>
+             * </frames>
+             */
+            if (Util.isEndTag(xpp, "frames")) {
+                break;
+            }
             assert xpp.getName().equals("frame") : xpp.getName() + " encountered";
             String file = getAttributeValue("file");
             int line = getAttributeIntValue("line");
diff --git a/src/org/rubyforge/debugcommons/reader/ThreadInfoReader.java b/src/org/rubyforge/debugcommons/reader/ThreadInfoReader.java
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import org.rubyforge.debugcommons.Util;
 import org.rubyforge.debugcommons.model.RubyThreadInfo;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -42,6 +43,15 @@ private void parse() throws XmlPullParserException, IOException {
         assert xpp.getName().equals("threads");
         while (!(nextEvent() == XmlPullParser.END_TAG && "threads".equals(xpp.getName()))) {
             ErrorReader.flushPossibleMessage(xpp);
+            /*
+             * Check for empty <threads>, e.g.:
+             * <threads>
+             * <message>
+             * </threads>
+             */
+            if (Util.isEndTag(xpp, "threads")) {
+                break;
+            }
             assert xpp.getName().equals("thread") : xpp.getName() + " encountered";
             int id = getAttributeIntValue("id");
             String status = getAttributeValue("status");
diff --git a/src/org/rubyforge/debugcommons/reader/VariablesReader.java b/src/org/rubyforge/debugcommons/reader/VariablesReader.java
@@ -64,6 +64,15 @@ private void parseVariables() throws XmlPullParserException, IOException {
                         "and file a bug against Ruby or debug-commons tracker.");
             }
             ErrorReader.flushPossibleMessage(xpp);
+            /*
+             * Check for empty <variables>, e.g.:
+             * <variables>
+             * <message>
+             * </variables>
+             */
+            if (Util.isEndTag(xpp, "variables")) {
+                break;
+            }
             assert xpp.getName().equals("variable") : xpp.getName() + "(type: " + Util.getType(xpp) + ") encountered";
             String name = getAttributeValue("name");
             String value = getAttributeValue("value");
