1 files changed, 16 insertions, 2 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
index 96703b1..37915ea 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDatabaseDAO.java
@@ -15,11 +15,15 @@ import java.sql.Savepoint;
 import java.sql.Statement;
 import java.util.HashSet;
 import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class VehicleDatabaseDAO implements VehicleDAO {
 
+    private static final Logger LOG = LoggerFactory.getLogger(VehicleDatabaseDAO.class);
+
     private final JDBCConnectionManager jdbcConnectionManager;
     private RegistrationDatabaseDAO registrationDatabaseDao;
 
@@ -84,10 +88,15 @@ public class VehicleDatabaseDAO implements VehicleDAO {
             }
 
             connection.commit();
-            connection.setAutoCommit(true);
         } catch (SQLException e) {
             rollbackAndEnableAutoCommit(connection, savepoint);
             throw new PersistenceException(e);
+        } finally {
+            try {
+                jdbcConnectionManager.getConnection().setAutoCommit(true);
+            } catch (SQLException e) {
+                LOG.error("Setting AutoCommit to true failed! ", e);
+            }
         }
         return id;
     }
@@ -156,10 +165,15 @@ public class VehicleDatabaseDAO implements VehicleDAO {
             }
 
             con.commit();
-            con.setAutoCommit(true);
         } catch (SQLException e) {
             rollbackAndEnableAutoCommit(con, savepoint);
             throw new PersistenceException(e);
+        } finally {
+            try {
+                jdbcConnectionManager.getConnection().setAutoCommit(true);
+            } catch (SQLException e) {
+                LOG.error("Setting AutoCommit to true failed! ", e);
+            }
         }
     }