mrglavas 2005/01/31 14:31:58 Modified: java/src/org/apache/xerces/util EntityResolver2Wrapper.java Log: Fixing a bug. The systemId passed to EntityResolver2.resolveEntity may be an absolute or relative URI. That is it should be the literal system identifier, not the expanded one which resolved from the base URI. Revision Changes Path 1.4 +3 -3 xml-xerces/java/src/org/apache/xerces/util/EntityResolver2Wrapper.java Index: EntityResolver2Wrapper.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/EntityResolver2Wrapper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- EntityResolver2Wrapper.java 14 May 2004 20:10:44 -0000 1.3 +++ EntityResolver2Wrapper.java 31 Jan 2005 22:31:58 -0000 1.4 @@ -1,5 +1,5 @@ /* - * Copyright 2004 The Apache Software Foundation. + * Copyright 2004,2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -149,7 +149,7 @@ if (fEntityResolver != null) { String pubId = resourceIdentifier.getPublicId(); - String sysId = resourceIdentifier.getExpandedSystemId(); + String sysId = resourceIdentifier.getLiteralSystemId(); String baseURI = resourceIdentifier.getBaseSystemId(); String name = null; if (resourceIdentifier instanceof XMLDTDDescription) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]