From 6f24579c8e0670dabcc2cb3180b3bd2a1115b7c1 Mon Sep 17 00:00:00 2001
From: heavyrain2012 <heavyrain.lee@gmail.com>
Date: Sat, 3 Apr 2021 14:27:11 +0800
Subject: [PATCH] update

---
 .../io/moquette/persistence/DatabaseStore.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
index 1e507f11..cab77486 100644
--- a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
+++ b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
@@ -1741,11 +1741,11 @@ public class DatabaseStore {
                     int count = statement.executeUpdate();
                     LOG.info("Update rows {}", count);
                 }
-
-                connection.commit();
-                connection.setAutoCommit(true);
             } catch (SQLException e) {
                 // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e, RDBS_Exception);
+            } finally {
                 if (connection != null) {
                     try {
                         connection.commit();
@@ -1754,9 +1754,6 @@ public class DatabaseStore {
                         e1.printStackTrace();
                     }
                 }
-                e.printStackTrace();
-                Utility.printExecption(LOG, e, RDBS_Exception);
-            } finally {
                 DBUtil.closeDB(connection, statement);
             }
     }
@@ -3082,11 +3079,11 @@ public class DatabaseStore {
                     int count = statement.executeUpdate();
                     LOG.info("Update rows {}", count);
                 }
-
-                connection.commit();
-                connection.setAutoCommit(true);
             } catch (SQLException e) {
                 // TODO Auto-generated catch block
+                e.printStackTrace();
+                Utility.printExecption(LOG, e, RDBS_Exception);
+            } finally {
                 if (connection != null) {
                     try {
                         connection.commit();
@@ -3095,9 +3092,6 @@ public class DatabaseStore {
                         e1.printStackTrace();
                     }
                 }
-                e.printStackTrace();
-                Utility.printExecption(LOG, e, RDBS_Exception);
-            } finally {
                 DBUtil.closeDB(connection, statement);
             }
         });