svn commit: r1649453 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java

[gmazza]

Author: gmazza
Date: Mon Jan  5 01:29:19 2015
New Revision: 1649453

URL: http://svn.apache.org/r1649453
Log:
ROL-2057 add NPE check, patch from Kohei Nozaki

Modified:
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1649453&r1=1649452&r2=1649453&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
 Mon Jan  5 01:29:19 2015
@@ -420,13 +420,18 @@ public class PageServlet extends HttpSer
         if (StringUtils.isNotEmpty(page.getOutputContentType())) {
             contentType = page.getOutputContentType() + "; charset=utf-8";
         } else {
-            String mimeType = RollerContext.getServletContext().getMimeType(
-                    page.getLink());
-            if (mimeType != null) {
-                // we found a match ... set the content deviceType
-                contentType = mimeType + "; charset=utf-8";
+            final String defaultContentType = "text/html; charset=utf-8";
+            if (page.getLink() == null) {
+                contentType = defaultContentType;
             } else {
-                contentType = "text/html; charset=utf-8";
+                String mimeType = 
RollerContext.getServletContext().getMimeType(
+                        page.getLink());
+                if (mimeType != null) {
+                    // we found a match ... set the content deviceType
+                    contentType = mimeType + "; charset=utf-8";
+                } else {
+                    contentType = defaultContentType;
+                }
             }
         }