Author: bleny Date: 2013-04-04 11:41:37 +0200 (Thu, 04 Apr 2013) New Revision: 69 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: remove dead code ; factorize Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-04 09:13:13 UTC (rev 68) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-04 09:41:37 UTC (rev 69) @@ -88,11 +88,8 @@ @Override public void clearDatabase() { - entityTransaction.rollback(); - entityTransaction = entityManager.getTransaction(); - entityTransaction.begin(); + rollback(); JpaUtil.cleanDatabase(entityManager); - entityTransaction.commit(); - entityTransaction.begin(); + commit(); } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-04 09:13:13 UTC (rev 68) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-04 09:41:37 UTC (rev 69) @@ -9,14 +9,12 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.Site; import com.franciaflex.magalie.persistence.entity.StoredArticle; -import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieFixtures; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.persistence.EntityManager; import java.util.Collection; public class FixturesService implements MagalieService { @@ -60,9 +58,6 @@ log.info("will restore database with fixture set"); } - EntityManager entityManager = - ((DefaultMagalieServiceContext) serviceContext).getEntityManager(); - MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); if (cleanDatabase) {