Mercurial > hg > release > icedtea6-1.3

changeset 1052:098f7819fe90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-09-23 Lillian Angel <langel@redhat.com> * configure.ac: Fixed help string for enable-visualvm. * rt/net/sourceforge/nanoxml/XMLElement.java: Fixed check for special tags.
author Lillian Angel <langel@redhat.com>
date Wed, 24 Sep 2008 13:56:07 -0400
parents f9d81fd1466d
children 09fccdb9f333
files ChangeLog configure.ac rt/net/sourceforge/nanoxml/XMLElement.java
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 24 11:44:16 2008 -0400
+++ b/ChangeLog	Wed Sep 24 13:56:07 2008 -0400
@@ -1,3 +1,9 @@
+2008-09-23  Lillian Angel  <langel@redhat.com>
+
+	* configure.ac: Fixed help string for enable-visualvm.
+	* rt/net/sourceforge/nanoxml/XMLElement.java: Fixed check for special
+	tags.
+
 2008-09-23  Deepak Bhole  <dbhole@redhat.com>
 	* IcedTeaPlugin.cc: Updated to call new plugin main class. Add function to
 	correctly recognize JS context.
--- a/configure.ac	Wed Sep 24 11:44:16 2008 -0400
+++ b/configure.ac	Wed Sep 24 13:56:07 2008 -0400
@@ -118,8 +118,7 @@
 
 AC_ARG_ENABLE([visualvm],
               [AS_HELP_STRING([--enable-visualvm],
-			                  [Enable compilation of visualvm. Requires that \
-							  --with-netbeans-dir=DIR is specified.])],
+			                  [Enable compilation of visualvm.])],
               [enable_visualvm="yes"], [enable_visualvm="no"])
 AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
 
--- a/rt/net/sourceforge/nanoxml/XMLElement.java	Wed Sep 24 11:44:16 2008 -0400
+++ b/rt/net/sourceforge/nanoxml/XMLElement.java	Wed Sep 24 13:56:07 2008 -0400
@@ -1255,6 +1255,7 @@
             this.reader = isr;
             this.parserLineNr = 0;
             int newline = 2;
+	    char prev = ' ';
 
             while(true) {
                 char ch;
@@ -1289,7 +1290,7 @@
 
                 // If the next char is a ? or !, then we've hit a special tag,
                 // and should skip it.
-                if (next == '!' || next == '?') {
+                if (prev == '<' && (next == '!' || next == '?')) {
                     this.skipSpecialTag(0);
                     this.sanitizeCharReadTooMuch = '\0';
                 }
@@ -1306,6 +1307,7 @@
                         }
                     }
                 }
+		prev = next;
             }
 
             out.close();