changeset in /hg/icedtea6: 2008-10-22 Omair Majid <omajid at redh...

[Omair Majid]

changeset e86a02a1a217 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e86a02a1a217
description:
	2008-10-22  Omair Majid  <omajid at redhat.com>

	       * rt/net/sourceforge/nanoxml/XMLElement.java
	       (sanitizeInput): Fix for last character of the jnlp file being ignored.

diffstat:

2 files changed, 18 insertions(+)
ChangeLog                                  |    5 +++++
rt/net/sourceforge/nanoxml/XMLElement.java |   13 +++++++++++++

diffs (43 lines):

diff -r 928b757d93db -r e86a02a1a217 ChangeLog
--- a/ChangeLog	Wed Oct 22 10:26:57 2008 -0400
+++ b/ChangeLog	Wed Oct 22 12:20:12 2008 -0400
@@ -1,3 +1,8 @@ 2008-10-22  Lillian Angel  <langel at redha
+2008-10-22  Omair Majid  <omajid at redhat.com>
+
+	* rt/net/sourceforge/nanoxml/XMLElement.java 
+	(sanitizeInput): Fix for last character of the jnlp file being ignored.
+
 2008-10-22  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Added quotes around DIST_ID.
diff -r 928b757d93db -r e86a02a1a217 rt/net/sourceforge/nanoxml/XMLElement.java
--- a/rt/net/sourceforge/nanoxml/XMLElement.java	Wed Oct 22 10:26:57 2008 -0400
+++ b/rt/net/sourceforge/nanoxml/XMLElement.java	Wed Oct 22 12:20:12 2008 -0400
@@ -1266,6 +1266,7 @@ public class XMLElement
 
                     int i = this.reader.read();
                     if (i == -1) {
+                        // no character in buffer, and nothing read
                         out.flush();
                         break;
                     } else if (i == 10) {
@@ -1278,7 +1279,19 @@ public class XMLElement
                 char next;
                 int i = this.reader.read();
                 if (i == -1) {
+                    // character in buffer and nothing read. write out
+                    // what's in the buffer
+                    out.print(ch);
                     out.flush();
+                    if (JNLPRuntime.isDebug()) {
+                        if (ch == 10) {
+                            System.out.println();
+                            System.out.print("line: " + newline + " ");
+                            newline++;
+                        } else {
+                            System.out.print(ch);
+                        }
+                    }
                     break;
                 } else if (i == 10) {
                     next = '\n';