[exo-jcr-commits] exo-jcr SVN: r5117 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/impl/util/jdbc and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-10-28 05:36:11 -0400 (Fri, 28 Oct 2011)
New Revision: 5117

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
   jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleaner.java
Log:
EXOJCR-1585: Fix bug

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java	2011-10-28 07:02:26 UTC (rev 5116)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java	2011-10-28 09:36:11 UTC (rev 5117)
@@ -96,6 +96,8 @@
       });
 
       DBCleaner dbCleaner = getWorkspaceDBCleaner(jdbcConn, wsEntry);
+      jdbcConn.setAutoCommit(false);
+
       try
       {
          dbCleaner.executeCleanScripts();
@@ -181,10 +183,6 @@
             jdbcConn.setAutoCommit(true);
          }
       }
-      else
-      {
-         jdbcConn.setAutoCommit(false);
-      }
 
       if (dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_ORACLE)
          || dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_ORACLEOCI)
@@ -841,10 +839,6 @@
             jdbcConn.setAutoCommit(true);
          }
       }
-      else
-      {
-         jdbcConn.setAutoCommit(false);
-      }
 
       if (!isMultiDB)
       {

Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleaner.java	2011-10-28 07:02:26 UTC (rev 5116)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/util/jdbc/TestDBCleaner.java	2011-10-28 09:36:11 UTC (rev 5117)
@@ -149,7 +149,7 @@
 
    public void testRemoveRepositoryMultiDB() throws Exception
    {
-      String repositoryName = "repoTestRemoveMulti";
+      String repositoryName = "repom";
 
       RepositoryEntry repositoryEntry = createMultiDB(repositoryName);
 
@@ -186,7 +186,7 @@
 
    public void testRemoveRepositorySingleDB() throws Exception
    {
-      String repositoryName = "repoTestRemoveSingle";
+      String repositoryName = "repos";
 
       RepositoryEntry repositoryEntry = createSingleDB(repositoryName);
 
@@ -247,6 +247,8 @@
 
       // remove content
       Connection jdbcConn = ds.getConnection();
+      jdbcConn.setAutoCommit(false);
+
       DBCleaner repositoryDBCleaner = DBCleanService.getRepositoryDBCleaner(jdbcConn, repositoryEntry);
 
       repositoryDBCleaner.executeCleanScripts();
@@ -293,6 +295,8 @@
 
       // remove content
       Connection jdbcConn = ds.getConnection();
+      jdbcConn.setAutoCommit(false);
+
       DBCleaner repositoryDBCleaner = DBCleanService.getRepositoryDBCleaner(jdbcConn, repositoryEntry);
 
       repositoryDBCleaner.executeCleanScripts();