You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2002/03/16 00:04:09 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLEntityManager.java
sandygao 02/03/15 15:04:09
Modified: java/src/org/apache/xerces/impl XMLEntityManager.java
Log:
Don't always use a new resource identifier object when calling the user's entity resolver. Try to use the one passed in, because it could contain more information (schema namespace, for example.)
Revision Changes Path
1.27 +11 -4 xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLEntityManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- XMLEntityManager.java 12 Mar 2002 21:32:48 -0000 1.26
+++ XMLEntityManager.java 15 Mar 2002 23:04:08 -0000 1.27
@@ -115,7 +115,7 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: XMLEntityManager.java,v 1.26 2002/03/12 21:32:48 neilg Exp $
+ * @version $Id: XMLEntityManager.java,v 1.27 2002/03/15 23:04:08 sandygao Exp $
*/
public class XMLEntityManager
implements XMLComponent, XMLEntityResolver {
@@ -535,9 +535,16 @@
// give the entity resolver a chance
XMLInputSource xmlInputSource = null;
if (fEntityResolver != null) {
- fResourceIdentifier.clear();
- fResourceIdentifier.setValues(publicId, literalSystemId, baseSystemId, expandedSystemId);
- xmlInputSource = fEntityResolver.resolveEntity(fResourceIdentifier);
+ XMLResourceIdentifierImpl ri = null;
+ if (resourceIdentifier instanceof XMLResourceIdentifierImpl) {
+ ri = (XMLResourceIdentifierImpl)resourceIdentifier;
+ }
+ else {
+ fResourceIdentifier.clear();
+ ri = fResourceIdentifier;
+ }
+ ri.setValues(publicId, literalSystemId, baseSystemId, expandedSystemId);
+ xmlInputSource = fEntityResolver.resolveEntity(ri);
}
// do default resolution
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org