Author: thomas.heute(a)jboss.com Date: 2011-03-10 10:46:21 -0500 (Thu, 10 Mar 2011) New Revision: 6004 Modified: epp/portal/branches/EPP_5_1_Branch/ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java Log: JBEPP-794: The header will be duplicated if contains a portlet adding more one resource to header Property changes on: epp/portal/branches/EPP_5_1_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /portal/branches/branch-GTNPORTAL-1731:5668 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1731:5668 Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-03-10 14:51:31 UTC (rev 6003) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-03-10 15:46:21 UTC (rev 6004) @@ -429,9 +429,9 @@ List<String> markupHeaders = new ArrayList<String>(); if (extraMarkupHeaders != null && !extraMarkupHeaders.isEmpty()) { - StringWriter sw = new StringWriter(); for (Element element : extraMarkupHeaders) { + StringWriter sw = new StringWriter(); DOMSerializer.serialize(element, sw); markupHeaders.add(sw.toString()); }