Author: hoang_to Date: 2011-05-25 23:27:48 -0400 (Wed, 25 May 2011) New Revision: 6564 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java Log: GTNPORTAL-1903: Possible NPE in org.exoplatform.portal.webui.util.Util.getPortalRequestContext() Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-05-25 23:18:25 UTC (rev 6563) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-05-26 03:27:48 UTC (rev 6564) @@ -48,6 +48,10 @@ static public PortalRequestContext getPortalRequestContext() { WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); + if(context == null) + { + return null; + } if (!(context instanceof PortalRequestContext)) { context = (WebuiRequestContext)context.getParentAppRequestContext();