changeset 466:aa559dc501c9

Merge
author asaha
date Tue, 17 Apr 2012 14:52:17 -0700
parents aa6df713daa9 937809680c79
children b1aa9ceea025
files .hgtags
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 12 15:52:14 2012 -0700
+++ b/.hgtags	Tue Apr 17 14:52:17 2012 -0700
@@ -166,3 +166,8 @@
 02400887d8c82eab88933df7167d1f8ab826113f jdk7u4-b18
 eb1f8bea2e93a498a9b9f42d33efad564d960407 jdk7u4-b19
 b08fa5f665726f578674c2d93b21b37a4330b16f jdk7u4-b20
+82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u6-b01
+6211e6e5c90efab0d033a99d9797a60aaad1f203 jdk7u6-b02
+2b8fd45212c5846f7c60e0b64fec9f0fba77b372 jdk7u6-b03
+47fdfdcfafefa16518c92175af789ca8a6920186 jdk7u6-b04
+2703191cc8d7a85993f456ab78b47af3620ca2d9 jdk7u6-b05
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Thu Apr 12 15:52:14 2012 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Tue Apr 17 14:52:17 2012 -0700
@@ -1803,6 +1803,7 @@
         String name = fEntityScanner.scanName();
         if (name == null) {
             reportFatalError("NameRequiredInReference", null);
+            return;
         }
         if (!fEntityScanner.skipChar(';')) {
             reportFatalError("SemicolonRequiredInReference", new Object []{name});