From do-not-reply at jboss.org  Wed Jun  3 09:47:31 2015
From: do-not-reply at jboss.org (do-not-reply at jboss.org)
Date: Wed, 3 Jun 2015 09:47:31 -0400
Subject: [gatein-commits] gatein SVN:  r9337 - epp/portal/branches.
Message-ID: <201506031347.t53DlVtw002409@svn01.web.mwc.hst.phx2.redhat.com>

Author: mputz
Date: 2015-06-03 09:47:30 -0400 (Wed, 03 Jun 2015)
New Revision: 9337

Added:
   epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ1225387/
Log:
Create Patch branch for BZ-1225387 based on BZ-861377


From do-not-reply at jboss.org  Wed Jun  3 11:50:31 2015
From: do-not-reply at jboss.org (do-not-reply at jboss.org)
Date: Wed, 3 Jun 2015 11:50:31 -0400
Subject: [gatein-commits] gatein SVN: r9338 -
	epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ1225387/webui/portal/src/main/java/org/exoplatform/portal/application.
Message-ID: <201506031550.t53FoVfh019748@svn01.web.mwc.hst.phx2.redhat.com>

Author: mputz
Date: 2015-06-03 11:50:31 -0400 (Wed, 03 Jun 2015)
New Revision: 9338

Modified:
   epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ1225387/webui/portal/src/main/java/org/exoplatform/portal/application/UserSiteLifeCycle.java
Log:
BZ-1225387 - Backport fix for GTNPORTAL-3497

Modified: epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ1225387/webui/portal/src/main/java/org/exoplatform/portal/application/UserSiteLifeCycle.java
===================================================================
--- epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ1225387/webui/portal/src/main/java/org/exoplatform/portal/application/UserSiteLifeCycle.java	2015-06-03 13:47:30 UTC (rev 9337)
+++ epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ1225387/webui/portal/src/main/java/org/exoplatform/portal/application/UserSiteLifeCycle.java	2015-06-03 15:50:31 UTC (rev 9338)
@@ -19,7 +19,9 @@
 
 package org.exoplatform.portal.application;
 
+import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.portal.config.DataStorage;
 import org.exoplatform.portal.config.UserPortalConfig;
 import org.exoplatform.portal.config.UserPortalConfigService;
@@ -70,6 +72,9 @@
          {
             log.debug("About to create user site for user " + userName);
             configService.createUserSite(userName);
+            // BZ 1059036 - Force the flushing of JCR.
+            RequestLifeCycle.end();
+            RequestLifeCycle.begin(ExoContainerContext.getCurrentContainer());            
          }
 
          UserPortalConfig userPortalConfig = context.getUserPortalConfig();
@@ -97,7 +102,7 @@
          }
          catch (Exception ex)
          {
-            log.warn("Navigation " + nav.getKey().getName() + " does not exist!", ex);
+            log.warn("Navigation for user " + userName + " does not exist!", ex);
          }
 
       }