hgomez 01/02/08 05:30:55
Modified: src/share/org/apache/tomcat/util/xml Tag: tomcat_32
XmlMapper.java
Log:
Fix a problem in resolving external public entities
this was fixed in TC 3.3
Submitted by: Frey Thibault <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.25.2.2 +3 -0
jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java
Index: XmlMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/xml/XmlMapper.java,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- XmlMapper.java 2000/07/07 11:58:51 1.25.2.1
+++ XmlMapper.java 2001/02/08 13:30:54 1.25.2.2
@@ -406,6 +406,9 @@
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException
{
+ if (publicId == null)
+ return (null); // if publicid is null, parser will handle that (tfr)
+
String dtd = (String) fileDTDs.get(publicId);
if( dtd != null ) {
File dtdF=new File( dtd );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
