User: starksm
Date: 01/06/21 22:37:52
Modified: tomcat/src/main/org/jboss/tomcat/naming
JbossWebXmlReader.java
Log:
Merged changes from the 2.2 branch
Revision Changes Path
1.6 +3 -3
contrib/tomcat/src/main/org/jboss/tomcat/naming/JbossWebXmlReader.java
Index: JbossWebXmlReader.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/naming/JbossWebXmlReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JbossWebXmlReader.java 2001/06/10 03:20:54 1.5
+++ JbossWebXmlReader.java 2001/06/22 05:37:52 1.6
@@ -31,7 +31,7 @@
@author <a href="mailto:[EMAIL PROTECTED]";>Kevin Lewis</a>
@author [EMAIL PROTECTED]
-@version $Revision: 1.5 $
+@version $Revision: 1.6 $
*/
public class JbossWebXmlReader extends BaseInterceptor
{
@@ -89,7 +89,7 @@
public InputSource resolveEntity(String publicId, String systemId)
{
String dtd = (String) dtds.get(publicId);
- InputStream is = null;
+ InputSource is = null;
if (dtd != null)
{
try
@@ -106,7 +106,7 @@
// ignore
}
}
- return null;
+ return is;
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
