You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/04/20 18:36:27 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/servlet TurbineServletService.java
jvanzyl 01/04/20 09:36:27
Modified: src/java/org/apache/turbine/services/servlet
TurbineServletService.java
Log:
- applying patch by <da...@b3interactive.com> to
fix NPE in TS.getResource().
Revision Changes Path
1.8 +8 -4 jakarta-turbine/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
Index: TurbineServletService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/servlet/TurbineServletService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineServletService.java 2001/03/06 06:12:50 1.7
+++ TurbineServletService.java 2001/04/20 16:36:24 1.8
@@ -83,7 +83,7 @@
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
* @author <a href="mailto:jvanzyl@periapt.com.com">Jason van Zyl</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineServletService.java,v 1.7 2001/03/06 06:12:50 chrise Exp $
+ * @version $Id: TurbineServletService.java,v 1.8 2001/04/20 16:36:24 jvanzyl Exp $
*/
public class TurbineServletService
extends TurbineBaseService implements ServletService
@@ -167,8 +167,12 @@
* @return an URL object or null is the uri is malformed or
* can't be resolved
*/
- public URL getResource( String uri ) {
- if ( servletContext == null) return null;
+ public URL getResource( String uri )
+ {
+ if ( servletContext == null)
+ {
+ return null;
+ }
URL url = null;
@@ -176,7 +180,7 @@
{
url = getServletContext().getResource( uri );
// work-around for Websphere 3.52
- if (url.toString().startsWith("classloader:"))
+ if (url != null && url.toString().startsWith("classloader:"))
{
url = new URL("file:" + url.toString().substring(12));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org