Mercurial > hg > openjdk > jigsaw > jaxp

changeset 392:192d8a244bc3 jdk8-b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author katleman
date Wed, 31 Oct 2012 18:30:51 -0700
parents fc589819b335 (diff) 121fc928a361 (current diff)
children 27ab79568c34
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Oct 26 14:25:17 2012 -0700
+++ b/.hgtags	Wed Oct 31 18:30:51 2012 -0700
@@ -183,3 +183,4 @@
 af9e8b0f1900b631a8a0fcccff9f1514fe58c808 jdk8-b59
 2d1dff5310daaf226421a8c92823cb8afcf35f31 jdk8-b60
 6b1db0b41d2f6e2a7b3bdbc8a8db823b47752906 jdk8-b61
+5d0fa0108d028c05753a47bcf2a598357dabf0c0 jdk8-b62
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Fri Oct 26 14:25:17 2012 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Wed Oct 31 18:30:51 2012 -0700
@@ -806,6 +806,7 @@
      *                 where the entity encoding is not auto-detected (e.g.
      *                 internal entities or a document entity that is
      *                 parsed from a java.io.Reader).
+     * @param augs     Additional information that may include infoset augmentations
      *
      * @throws XNIException Thrown by handler to signal an error.
      */
@@ -833,7 +834,7 @@
         // call handler
         if (fDocumentHandler != null && !fScanningAttribute) {
             if (!name.equals("[xml]")) {
-                fDocumentHandler.startGeneralEntity(name, identifier, encoding, null);
+                fDocumentHandler.startGeneralEntity(name, identifier, encoding, augs);
             }
         }
 
@@ -845,6 +846,7 @@
      * are just specified by their name.
      *
      * @param name The name of the entity.
+     * @param augs Additional information that may include infoset augmentations
      *
      * @throws XNIException Thrown by handler to signal an error.
      */
@@ -869,7 +871,7 @@
         // call handler
         if (fDocumentHandler != null && !fScanningAttribute) {
             if (!name.equals("[xml]")) {
-                fDocumentHandler.endGeneralEntity(name, null);
+                fDocumentHandler.endGeneralEntity(name, augs);
             }
         }