[gatein-commits] gatein SVN: r4540 - in epp/portal/branches/EPP_5_1_Branch: examples/portal/war/src/main/webapp/WEB-INF and 1 other directories.

Author: thomas.heute(a)jboss.com Date: 2010-10-06 10:23:40 -0400 (Wed, 06 Oct 2010) New Revision: 4540 Modified: epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml Log: JBEPP-536: Avoid NPE when a portal container has been disabled Modified: epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-10-06 13:47:55 UTC (rev 4539) +++ epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-10-06 14:23:40 UTC (rev 4540) @@ -19,6 +19,7 @@ package org.exoplatform.web; +import org.exoplatform.commons.utils.PropertyManager; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.PortalContainer; @@ -140,7 +141,19 @@ PortalContainer.setInstance(portalContainer); hasBeenSet = true; } - broadcast(portalContainer, CONTEXT_DESTROYED, event); + final String ctxName = event.getServletContext().getServletContextName(); + if (!PortalContainer.isPortalContainerNameDisabled(ctxName) && portalContainer instanceof PortalContainer) + { + // The portal container corresponding to the current servlet context could be found + broadcast(portalContainer, CONTEXT_DESTROYED, event); + } + else if (PropertyManager.isDevelopping()) + { + log.info("The portal environment could not be set for the webapp '" + ctxName + + "' because this servlet context has not been defined as a " + + "dependency of any portal container or it is a disabled portal" + + " container, the contextDestroyed event will be ignored"); + } } catch (Exception ex) { Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-10-06 13:47:55 UTC (rev 4539) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-10-06 14:23:40 UTC (rev 4540) @@ -73,7 +73,15 @@ <filter-name>CacheUserProfileFilter</filter-name> <filter-class>org.exoplatform.web.CacheUserProfileFilter</filter-class> </filter> + <filter> + <filter-name>PortalContainerFilter</filter-name> + <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>PortalContainerFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> <filter-mapping> <filter-name>GenericFilter</filter-name> <url-pattern>/*</url-pattern> Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2010-10-06 13:47:55 UTC (rev 4539) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2010-10-06 14:23:40 UTC (rev 4540) @@ -94,8 +94,16 @@ <filter-name>ClusteredSSOFilter</filter-name> <filter-class>org.exoplatform.web.login.ClusteredSSOFilter</filter-class> </filter> + <filter> + <filter-name>PortalContainerFilter</filter-name> + <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class> + </filter> <filter-mapping> + <filter-name>PortalContainerFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>RememberMeFilter</filter-name> <url-pattern>/public/*</url-pattern> </filter-mapping>