[portal-commits] JBoss Portal SVN: r11776 - branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2008-09-01 06:11:05 -0400 (Mon, 01 Sep 2008)
New Revision: 11776

Modified:
   branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java
Log:
NPE when the file couldn't be found

Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java	2008-09-01 07:36:20 UTC (rev 11775)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java	2008-09-01 10:11:05 UTC (rev 11776)
@@ -236,7 +236,6 @@
 
       //
       URLFactory resourceURLFactory = new GlobalURLFactory(((JBossRenderRequest)req).getControllerContext());
-      String path = file.getBasePath();
       
       try
       {
@@ -245,6 +244,7 @@
          resp.setContentType("text/html");
          if (file != null)
          {
+            String path = file.getBasePath();
             if(file.getContent().getMimeType().startsWith("image/"))
             {
                String imageURI = path;
@@ -319,6 +319,7 @@
             PrintWriter writer = resp.getWriter();
             String sHTML = "";
             ResourceBundle rb = getPortletConfig().getResourceBundle(req.getLocale());
+            String path = file.getBasePath();
             if (path == null || path.trim().length() == 0)
             {
                sHTML = "<h2>" + rb.getString("CMS_ACCESS_DENIED")+ "</h2>" + rb.getString("CMS_ACCESS_DENIED_DESCRIPTION");