Merge
This commit is contained in:
commit
cb7543fafd
@ -806,6 +806,7 @@ public class XMLDocumentFragmentScannerImpl
|
|||||||
* where the entity encoding is not auto-detected (e.g.
|
* where the entity encoding is not auto-detected (e.g.
|
||||||
* internal entities or a document entity that is
|
* internal entities or a document entity that is
|
||||||
* parsed from a java.io.Reader).
|
* parsed from a java.io.Reader).
|
||||||
|
* @param augs Additional information that may include infoset augmentations
|
||||||
*
|
*
|
||||||
* @throws XNIException Thrown by handler to signal an error.
|
* @throws XNIException Thrown by handler to signal an error.
|
||||||
*/
|
*/
|
||||||
@ -833,7 +834,7 @@ public class XMLDocumentFragmentScannerImpl
|
|||||||
// call handler
|
// call handler
|
||||||
if (fDocumentHandler != null && !fScanningAttribute) {
|
if (fDocumentHandler != null && !fScanningAttribute) {
|
||||||
if (!name.equals("[xml]")) {
|
if (!name.equals("[xml]")) {
|
||||||
fDocumentHandler.startGeneralEntity(name, identifier, encoding, null);
|
fDocumentHandler.startGeneralEntity(name, identifier, encoding, augs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -845,6 +846,7 @@ public class XMLDocumentFragmentScannerImpl
|
|||||||
* are just specified by their name.
|
* are just specified by their name.
|
||||||
*
|
*
|
||||||
* @param name The name of the entity.
|
* @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.
|
* @throws XNIException Thrown by handler to signal an error.
|
||||||
*/
|
*/
|
||||||
@ -869,7 +871,7 @@ public class XMLDocumentFragmentScannerImpl
|
|||||||
// call handler
|
// call handler
|
||||||
if (fDocumentHandler != null && !fScanningAttribute) {
|
if (fDocumentHandler != null && !fScanningAttribute) {
|
||||||
if (!name.equals("[xml]")) {
|
if (!name.equals("[xml]")) {
|
||||||
fDocumentHandler.endGeneralEntity(name, null);
|
fDocumentHandler.endGeneralEntity(name, augs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user