[gatein-commits] gatein SVN: r2636 - in portal/trunk/component: web/src/main/java/org/exoplatform/web and 1 other directory.

Author: bdaw Date: 2010-04-14 08:44:20 -0400 (Wed, 14 Apr 2010) New Revision: 2636 Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java portal/trunk/component/web/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java Log: - GTNPORTAL-1048 - check if there is active transaction before starting a new one; wrap IDM call in CacheUserProfileFilter with transaction for different flow with SSO integration Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-04-14 12:11:51 UTC (rev 2635) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-04-14 12:44:20 UTC (rev 2636) @@ -31,6 +31,7 @@ import org.picocontainer.Startable; import javax.naming.InitialContext; +import javax.transaction.Status; import javax.transaction.UserTransaction; import java.util.LinkedList; import java.util.concurrent.atomic.AtomicInteger; @@ -141,11 +142,17 @@ if (configuration.isUseJTA()) { UserTransaction tx = (UserTransaction)new InitialContext().lookup("java:comp/UserTransaction"); - tx.begin(); + if (tx.getStatus() == Status.STATUS_NO_TRANSACTION) + { + tx.begin(); + } } else { - idmService_.getIdentitySession().beginTransaction(); + if (!idmService_.getIdentitySession().getTransaction().isActive()) + { + idmService_.getIdentitySession().beginTransaction(); + } } } catch (Exception e) Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java 2010-04-14 12:11:51 UTC (rev 2635) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java 2010-04-14 12:44:20 UTC (rev 2636) @@ -19,6 +19,8 @@ package org.exoplatform.web; +import org.exoplatform.container.component.ComponentRequestLifecycle; +import org.exoplatform.container.component.RequestLifeCycle; import org.exoplatform.container.web.AbstractFilter; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -59,7 +61,9 @@ OrganizationService orgService = (OrganizationService)getContainer().getComponentInstanceOfType(OrganizationService.class); + begin(orgService); User user = orgService.getUserHandler().findUserByName(state.getIdentity().getUserId()); + end(orgService); state.setAttribute(USER_PROFILE, user); } @@ -77,4 +81,20 @@ public void destroy() { } + + public void begin(OrganizationService orgService) throws Exception + { + if (orgService instanceof ComponentRequestLifecycle) + { + RequestLifeCycle.begin((ComponentRequestLifecycle)orgService); + } + } + + public void end(OrganizationService orgService) throws Exception + { + if (orgService instanceof ComponentRequestLifecycle) + { + RequestLifeCycle.end(); + } + } }