[portal-commits] JBoss Portal SVN: r5755 - branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag

[portal-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-12-04 12:57:10 -0500 (Mon, 04 Dec 2006)
New Revision: 5755

Modified:
   branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
Log:
JBPORTAL-1149 - tag header injection fix.

Modified: branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java	2006-12-04 17:52:59 UTC (rev 5754)
+++ branches/JBoss_Portal_Branch_2_4/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java	2006-12-04 17:57:10 UTC (rev 5755)
@@ -22,10 +22,10 @@
  ******************************************************************************/
 package org.jboss.portal.theme.tag;
 
+import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.theme.LayoutConstants;
 import org.jboss.portal.theme.page.PageResult;
 import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.portlet.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
@@ -71,12 +71,15 @@
          WindowResult result = page.getWindowResult(windowID);
 
          Properties responseProperties = result.getResponseProperties();
-         String headerContentProperty = responseProperties.getProperty("HEADER_CONTENT");
-         if (headerContentProperty != null)
+         if (responseProperties != null)
          {
-            out.println(headerContentProperty);
+            String headerContentProperty = responseProperties.getProperty("HEADER_CONTENT");
+            if (headerContentProperty != null)
+            {
+               out.println(headerContentProperty);
+            }
          }
-         
+
          if (result.getHeaderContent() != null)
          {
             out.println(result.getHeaderContent());