Mercurial > hg > release > icedtea7-forest-2.6 > jaxp

changeset 513:ff514c638d9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u12-b03
author andrew
date Fri, 30 Nov 2012 12:17:01 +0000
parents 8e9679984e79 (current diff) 464e19bd9db8 (diff)
children b67573b17099
files .hgtags src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
diffstat 2 files changed, 19 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Oct 06 05:22:12 2012 +0100
+++ b/.hgtags	Fri Nov 30 12:17:01 2012 +0000
@@ -206,8 +206,20 @@
 8824bcbfd7cd8059ededf70f1e7f2b06f02cb33f jdk7u6-b23
 378f719cfb9491b766cd9f7cd47ad7fa3503e141 jdk7u6-b24
 5f1b80e8baec46fc28826a3a6ab8e1913c872f4c jdk7u6-b30
+2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u6-b31
 2eafa8a6fd8fdb54b10045e247d1a57f9817f473 jdk7u7-b10
 c4aa15da8529451cc678d5747e7b82e9cc38627e jdk7u7-b30
+f6e11679b12e1548f407b78a940c568401dd2a19 jdk7u7-b11
+7840a267c777e22004912ad0aadd5258ac3d36c6 jdk7u7-b31
+61fc72e9fe26b3acf1572866143c22719c088b62 jdk7u7-b01
+78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u7-b02
+fc7c5aa8c722f28c59560ce83140e803d853afc9 jdk7u9-b03
+0000000000000000000000000000000000000000 jdk7u7-b01
+61fc72e9fe26b3acf1572866143c22719c088b62 jdk7u9-b01
+0000000000000000000000000000000000000000 jdk7u7-b02
+78d9e4853388a2e7be18ff18c0b5330c074cb514 jdk7u9-b02
+b12a2d557c5e302b614c5f7e25ad6c8a0e138742 jdk7u9-b04
+ab4bbb93b3831aca230c62431f7fe02b56793450 jdk7u9-b05
 1365e7472a3b737dda4a73e06ad41718d667d9be jdk7u8-b01
 0a313d4307930be3a64106b9b8c90f9342673aa0 jdk7u8-b02
 36cba5ea434944cef64fa281112b158fae93c0fa jdk7u8-b03
@@ -217,3 +229,6 @@
 9205eb81886de12f9e3324ac8e0c7cec536b22d5 jdk7u10-b07
 720eb6c26227887ad11eb401f91a10878c3c7b6b jdk7u10-b08
 3a33a35b2d24cb671050e61aa4930a951bc35d2b jdk7u10-b09
+27bab008eee997a2a8a78d6fe72a56c87c1c2b2b jdk7u12-b01
+8e3a4e47ce71a0add89eca5b079e02ae3a81c594 jdk7u12-b02
+1aa52991dfa7468d676557bf9fd6fd0e98c3d097 jdk7u12-b03
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Sat Oct 06 05:22:12 2012 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java	Fri Nov 30 12:17:01 2012 +0000
@@ -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);
             }
         }