You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/07/19 02:57:25 UTC
svn commit: r557440 -
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
Author: agilliland
Date: Wed Jul 18 17:57:24 2007
New Revision: 557440
URL: http://svn.apache.org/viewvc?view=rev&rev=557440
Log:
avoid null pointer happening if theme name is empty string.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=557440&r1=557439&r2=557440
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java Wed Jul 18 17:57:24 2007
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
@@ -101,7 +102,7 @@
InputStream resourceStream = null;
// first, see if we have a preview theme to operate from
- if(resourceRequest.getThemeName() != null) {
+ if(!StringUtils.isEmpty(resourceRequest.getThemeName())) {
Theme theme = resourceRequest.getTheme();
ThemeResource resource = theme.getResource(resourceRequest.getResourcePath());
if(resource != null) {