Author: mageshbk(a)jboss.com
Date: 2009-04-02 03:11:06 -0400 (Thu, 02 Apr 2009)
New Revision: 13111
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java
Log:
[JBPORTAL-2361] - Added null checking and set headers if FragmentResponse too
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java 2009-04-01
15:38:23 UTC (rev 13110)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HttpHeaderInterceptor.java 2009-04-02
07:11:06 UTC (rev 13111)
@@ -73,25 +73,35 @@
if (response instanceof UpdateNavigationalStateResponse)
{
UpdateNavigationalStateResponse unsr = (UpdateNavigationalStateResponse)
response;
- for (Cookie cookie : unsr.getProperties().getCookies())
+ if (unsr.getProperties() != null)
{
- addCookie(invocation, cookie);
+ for (Cookie cookie : unsr.getProperties().getCookies())
+ {
+ addCookie(invocation, cookie);
+ }
+ for (String key: unsr.getProperties().getTransportHeaders().keySet())
+ {
+ String value = unsr.getProperties().getTransportHeaders().getValue(key);
+ ((AbstractServerContext)
invocation.getServerContext()).getResponse().addHeader(key, value);
+ }
}
- for (String key: unsr.getProperties().getTransportHeaders().keySet())
- {
- String value = unsr.getProperties().getTransportHeaders().getValue(key);
- ((AbstractServerContext)
invocation.getServerContext()).getResponse().addHeader(key, value);
- }
}
else if (response instanceof FragmentResponse)
{
FragmentResponse fr = (FragmentResponse) response;
- for (Cookie cookie : fr.getProperties().getCookies())
+ if (fr.getProperties() != null)
{
- addCookie(invocation, cookie);
+ for (Cookie cookie : fr.getProperties().getCookies())
+ {
+ addCookie(invocation, cookie);
+ }
+ for (String key: fr.getProperties().getTransportHeaders().keySet())
+ {
+ String value = fr.getProperties().getTransportHeaders().getValue(key);
+ ((AbstractServerContext)
invocation.getServerContext()).getResponse().addHeader(key, value);
+ }
}
}
-
//
return response;
}
Show replies by date