GTNPORTAL-3250: The portlets cannot be displayed after a portal reload

component/pc/src/main/java/org/exoplatform/portal/pc/ExoKernelIntegration.java

@@ -22,9 +22,9 @@
 import org.exoplatform.commons.utils.PropertyManager;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.portal.pc.aspects.PortletLifecyclePhaseInterceptor;
 import org.exoplatform.services.resources.PortletConfigRegistry;
 import org.exoplatform.services.resources.ResourceBundleService;
-import org.exoplatform.portal.pc.aspects.PortletLifecyclePhaseInterceptor;
 import org.gatein.common.logging.Logger;
 import org.gatein.common.logging.LoggerFactory;
 import org.gatein.pc.api.PortletInvoker;
@@ -71,6 +71,11 @@ public class ExoKernelIntegration implements Startable, WebAppListener {
     /** DO NOT REMOVE ME, OTHERWISE YOU'LL BREAK THINGS. */
     private final ResourceBundleService resourceBundleService;
 
+    /**
+     * Indicates whether or not the producerPortletInvoker has been registered from this class
+     */
+    private boolean producerPortletInvokerSet;
+
     /** . */
     private Logger log = LoggerFactory.getLogger(ExoKernelIntegration.class);
 
@@ -171,6 +176,7 @@ public void start() {
         // register the producer portlet invoker if it hasn't been already
         if (!federatingPortletInvoker.isResolved(PortletInvoker.LOCAL_PORTLET_INVOKER_ID)) {
             federatingPortletInvoker.registerInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, producerPortletInvoker);
+            producerPortletInvokerSet = true;
         }
 
         // The consumer portlet invoker
@@ -191,13 +197,24 @@ public void start() {
 
     public void stop() {
         ServletContainerFactory.getServletContainer().removeWebAppListener(this);
+        if (!producerPortletInvokerSet || !PropertyManager.isDevelopping()) {
+           // The current instance did not register the producerPortletInvoker so we have nothing to do or we are not in
+           // developing mode
+           return;
+        }
+        final ExoContainer topContainer = ExoContainerContext.getTopContainer();
+        FederatingPortletInvoker federatingPortletInvoker = (FederatingPortletInvoker) topContainer
+                .getComponentInstanceOfType(FederatingPortletInvoker.class);
+        if (federatingPortletInvoker != null && federatingPortletInvoker.isResolved(PortletInvoker.LOCAL_PORTLET_INVOKER_ID)) {
+           // The current instance registered the producerPortletInvoker so we have to unregister it
+           federatingPortletInvoker.unregisterInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID);
+        }
     }
 
     public PortletApplicationDeployer getPortletApplicationRegistry() {
         return portletApplicationRegistry;
     }
 
-    @Override
     public void onEvent(WebAppEvent event) {
         if (event instanceof WebAppLifeCycleEvent) {
             WebAppLifeCycleEvent lifeCycleEvent = (WebAppLifeCycleEvent) event;