jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
changeset 35333 1a6e1fdb7c5e
parent 33352 35c096b5709c
child 35334 1103488dda92
equal deleted inserted replaced
35005:2dc4c11fe488 35333:1a6e1fdb7c5e
  1006             //wrap this XMLInputSource to StaxInputSource
  1006             //wrap this XMLInputSource to StaxInputSource
  1007             staxInputSource = new StaxXMLInputSource(xmlInputSource, fISCreatedByResolver);
  1007             staxInputSource = new StaxXMLInputSource(xmlInputSource, fISCreatedByResolver);
  1008         }
  1008         }
  1009 
  1009 
  1010         // do default resolution
  1010         // do default resolution
  1011         //this works for both stax & Xerces, if staxInputSource is null, it means parser need to revert to default resolution
  1011         //this works for both stax & Xerces, if staxInputSource is null,
       
  1012         //it means parser need to revert to default resolution
  1012         if (staxInputSource == null) {
  1013         if (staxInputSource == null) {
  1013             // REVISIT: when systemId is null, I think we should return null.
  1014             // REVISIT: when systemId is null, I think we should return null.
  1014             //          is this the right solution? -SG
  1015             //          is this the right solution? -SG
  1015             //if (systemId != null)
  1016             //if (systemId != null)
  1016             staxInputSource = new StaxXMLInputSource(new XMLInputSource(publicId, literalSystemId, baseSystemId));
  1017             staxInputSource = new StaxXMLInputSource(
       
  1018                     new XMLInputSource(publicId, literalSystemId, baseSystemId), false);
  1017         }else if(staxInputSource.hasXMLStreamOrXMLEventReader()){
  1019         }else if(staxInputSource.hasXMLStreamOrXMLEventReader()){
  1018             //Waiting for the clarification from EG. - nb
  1020             //Waiting for the clarification from EG. - nb
  1019         }
  1021         }
  1020 
  1022 
  1021         if (DEBUG_RESOLVER) {
  1023         if (DEBUG_RESOLVER) {