From d5e8f8559f59a43b6d5907ee2143713d37ae68b4 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Sat, 16 Jun 2018 14:49:30 +0200
Subject: Remove finally block, reset autocommit in RegistrationDB-DAO [#27305]

---
 .../einsatzverwaltung/dao/RegistrationDatabaseDAO.java        | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
index 59f8e52..c3b1227 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAO.java
@@ -83,23 +83,16 @@ public class RegistrationDatabaseDAO implements RegistrationDAO {
             updateVehicle.executeUpdate();
 
             connection.commit();
+            connection.setAutoCommit(true);
             return returnValues;
         } catch (SQLException e) {
             try {
                 connection.rollback();
+                connection.setAutoCommit(true);
             } catch (SQLException e1) {
                 LOG.error("Rollback failed! Error message: {}", e.getMessage());
             }
             throw new PersistenceException(e);
-        } finally {
-            try {
-                connection.setAutoCommit(true);
-            } catch (SQLException e) {
-                LOG.error(
-                        "Setting back AutoCommit to false failed! Error message: {}",
-                        e.getMessage());
-                // SonarLint insists on me not throwing anything here...
-            }
         }
     }
 
-- 
cgit v1.2.3-70-g09d2