stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6770436: Entity callback order differs between Java1.5 and Java1.6

Browse Source 
Reviewed-by: lancea
This commit is contained in:
Joe Wang 2014-11-04 09:10:11 -08:00
parent ce7a159195
commit 25e91b769f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
View File

@ -383,6 +383,8 @@ public class XMLDocumentFragmentScannerImpl
protected boolean foundBuiltInRefs = false; protected boolean foundBuiltInRefs = false;
/** Built-in reference character event */
protected boolean builtInRefCharacterHandled = false;
//skip element algorithm //skip element algorithm
static final short MAX_DEPTH_LIMIT = 5 ; static final short MAX_DEPTH_LIMIT = 5 ;
@ -1949,7 +1951,10 @@ public class XMLDocumentFragmentScannerImpl
fDocumentHandler.startGeneralEntity(entity, null, null, null); fDocumentHandler.startGeneralEntity(entity, null, null, null);
} }
fTempString.setValues(fSingleChar, 0, 1); fTempString.setValues(fSingleChar, 0, 1);
//fDocumentHandler.characters(fTempString, null); if(!fIsCoalesce){
fDocumentHandler.characters(fTempString, null);
builtInRefCharacterHandled = true;
}
if (fNotifyBuiltInRefs) { if (fNotifyBuiltInRefs) {
fDocumentHandler.endGeneralEntity(entity, null); fDocumentHandler.endGeneralEntity(entity, null);
@ -3068,7 +3073,12 @@ public class XMLDocumentFragmentScannerImpl
//return CHARACTERS //return CHARACTERS
if(fScannerState == SCANNER_STATE_BUILT_IN_REFS && !fIsCoalesce){ if(fScannerState == SCANNER_STATE_BUILT_IN_REFS && !fIsCoalesce){
setScannerState(SCANNER_STATE_CONTENT); setScannerState(SCANNER_STATE_CONTENT);
return XMLEvent.CHARACTERS; if (builtInRefCharacterHandled) {
builtInRefCharacterHandled = false;
return XMLEvent.ENTITY_REFERENCE;
} else {
return XMLEvent.CHARACTERS;
}
} }
//if there was a text declaration, call next() it will be taken care. //if there was a text declaration, call next() it will be taken care.