Author: tolusha Date: 2011-11-03 06:23:05 -0400 (Thu, 03 Nov 2011) New Revision: 5155 Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java Log: EXOJCR-1594: remove unnecessary openSession() calls Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java 2011-11-03 09:45:39 UTC (rev 5154) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/GroupDAOImpl.java 2011-11-03 10:23:05 UTC (rev 5155) @@ -138,7 +138,6 @@ if (broadcast) preSave(child, true); - session = service_.openSession(); session.save(childImpl); session.flush(); Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2011-11-03 09:45:39 UTC (rev 5154) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2011-11-03 10:23:05 UTC (rev 5155) @@ -210,7 +210,7 @@ { if (broadcast) preDelete(m); - session = service_.openSession(); + session.delete(m); session.flush(); @@ -234,6 +234,7 @@ { if (broadcast) preDelete(m); + Session session = service_.openSession(); session.delete(m); session.flush(); Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java 2011-11-03 09:45:39 UTC (rev 5154) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserDAOImpl.java 2011-11-03 10:23:05 UTC (rev 5155) @@ -152,7 +152,7 @@ if (broadcast) preDelete(foundUser); - session = service_.openSession(); + session.delete(foundUser); ((UserProfileDAOImpl)orgService.getUserProfileHandler()).removeUserProfileEntry(userName, session); MembershipDAOImpl.removeMembershipEntriesOfUser(userName, session); Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2011-11-03 09:45:39 UTC (rev 5154) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2011-11-03 10:23:05 UTC (rev 5155) @@ -109,7 +109,6 @@ if (broadcast) preSave(profile, true); - session = service_.openSession(); session.save(profile.getUserName(), upd); session.flush(); cache_.put(profile.getUserName(), profile); @@ -123,7 +122,6 @@ if (broadcast) preSave(profile, false); - session = service_.openSession(); session.update(upd); session.flush(); cache_.put(profile.getUserName(), profile); @@ -146,7 +144,6 @@ if (broadcast) preDelete(profile); - session = service_.openSession(); session.delete(upd); session.flush(); cache_.remove(userName);