[gatein-commits] gatein SVN: r8403 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

Friday, 3 February 2012


Author: mwringe
Date: 2012-02-03 18:28:22 -0500 (Fri, 03 Feb 2012)
New Revision: 8403

Modified:
  
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
GTNPORTAL-2347: the resource id is sometimes set as a request parameter by the portal (see
ExoPortletInvocationContext). We need to also check this location to retrieve the resource
id for a portlet invocation.

Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
---
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java	2012-02-03
19:04:07 UTC (rev 8402)
+++
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java	2012-02-03
23:28:22 UTC (rev 8403)
@@ -748,6 +748,10 @@
          {
             resourceInvocation.setResourceId(resourceId);
          }
+         else if
(!ParameterValidation.isNullOrEmpty(prc.getRequestParameter(Constants.RESOURCE_ID_PARAMETER)))
+         {
+           
resourceInvocation.setResourceId(prc.getRequestParameter(Constants.RESOURCE_ID_PARAMETER));
+         }
 
          String cachability =
servletRequest.getParameter(Constants.CACHELEVEL_PARAMETER);
          if (!ParameterValidation.isNullOrEmpty(cachability))


    