Merge
authorkatleman
Wed, 31 Oct 2012 18:30:51 -0700
changeset 14251 590a9a630b02
parent 14249 8715a93f843e (diff)
parent 14250 d3604db57c7b (current diff)
child 14252 dbbca46c21ff
Merge
--- a/jaxp/.hgtags	Fri Oct 26 14:25:17 2012 -0700
+++ b/jaxp/.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/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Fri Oct 26 14:25:17 2012 -0700
+++ b/jaxp/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);
             }
         }