You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by el...@apache.org on 2006/10/13 05:13:32 UTC
svn commit: r463554 -
/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
Author: eliast
Date: Thu Oct 12 20:13:30 2006
New Revision: 463554
URL: http://svn.apache.org/viewvc?view=rev&rev=463554
Log:
Fixed NPE when resource is not part of the theme.
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=463554&r1=463553&r2=463554
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java Thu Oct 12 20:13:30 2006
@@ -109,8 +109,10 @@
ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
Theme weblogTheme = themeMgr.getTheme(weblog.getEditorTheme());
File resource = weblogTheme.getResource(resourceRequest.getResourcePath());
- resourceLastMod = resource.lastModified();
- resourceStream = new FileInputStream(resource);
+ if(resource != null) {
+ resourceLastMod = resource.lastModified();
+ resourceStream = new FileInputStream(resource);
+ }
} catch (Exception ex) {
// hmmm, some kind of error getting theme. that's an error.
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);