From 25e47d9f694fc9805e1ac20930abdd1b514d3cac Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@sonarsource.com>
Date: Tue, 14 Oct 2014 15:41:28 +0200
Subject: removed un-necessary try/catch

---
 .../src/main/java/org/sonar/server/db/BaseDao.java         | 14 +++++---------
 .../org/sonar/server/component/db/ComponentDaoTest.java    |  3 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
index 71426bec541..b9f51f14b41 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
@@ -360,15 +360,11 @@ public abstract class BaseDao<MAPPER, DTO extends Dto<KEY>, KEY extends Serializ
       LOGGER.warn("Synchronizer should only be used with BatchSession!");
     }
 
-    try {
-      DbSynchronizationHandler handler = getSynchronizationResultHandler(session, params);
-      session.select(getSynchronizeStatementFQN(), getSynchronizationParams(date, params), handler);
-      handler.enqueueCollected();
-      session.enqueue(new RefreshIndex(this.getIndexType()));
-      session.commit();
-    } catch (Exception e) {
-      throw new IllegalStateException(e);
-    }
+    DbSynchronizationHandler handler = getSynchronizationResultHandler(session, params);
+    session.select(getSynchronizeStatementFQN(), getSynchronizationParams(date, params), handler);
+    handler.enqueueCollected();
+    session.enqueue(new RefreshIndex(this.getIndexType()));
+    session.commit();
   }
 
   private String getSynchronizeStatementFQN() {
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
index bb492c16a0b..19017b84411 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentDaoTest.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.component.db;
 
+import org.apache.ibatis.exceptions.PersistenceException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -362,7 +363,7 @@ public class ComponentDaoTest extends AbstractDaoTestCase {
     checkTable("delete", "projects");
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test(expected = PersistenceException.class)
   public void synchronize_after() {
     dao.synchronizeAfter(session, new Date(0L));
   }
-- 
cgit v1.2.3