From e367a02e8efdf2f43194efddaaec75f45b17106e Mon Sep 17 00:00:00 2001
From: lingyun304 <lingyun304@163.com>
Date: Fri, 10 Apr 2020 17:47:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20xxl-job-admin/src/main/java/com/xxl/jo?=
 =?UTF-8?q?b/admin/core/thread/JobScheduleHelper.java.=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4preparedStatement=E5=92=8Cconn=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=EF=BC=8C=E6=88=91=E4=BB=AC=E5=9C=A8?=
 =?UTF-8?q?=E5=81=9A=E8=BE=BE=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=97=B6=EF=BC=8C=E8=BF=99=E4=B8=AA=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=AE=9A=E6=97=B6=E5=91=A8=E6=9C=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=A8=8B=E5=BA=8F=E5=81=87=E6=AD=BB=EF=BC=88=E5=9C=A8?=
 =?UTF-8?q?1=E7=A7=92=E6=89=A7=E8=A1=8C=E4=B8=80=E6=AC=A1=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=90=8E=E8=A7=A3=E5=86=B3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/core/thread/JobScheduleHelper.java  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
index 765161a9..d731fcbc 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java
@@ -146,36 +146,34 @@ public class JobScheduleHelper {
                             logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}", e);
                         }
                     } finally {
-
-                        // commit
-                        if (conn != null) {
+                        // close PreparedStatement
+                        if (null != preparedStatement) {
                             try {
-                                conn.commit();
+                                preparedStatement.close();
                             } catch (SQLException e) {
                                 if (!scheduleThreadToStop) {
                                     logger.error(e.getMessage(), e);
                                 }
                             }
+                        }
+                        // commit
+                        if (conn != null) {
                             try {
-                                conn.setAutoCommit(connAutoCommit);
+                                conn.commit();
                             } catch (SQLException e) {
                                 if (!scheduleThreadToStop) {
                                     logger.error(e.getMessage(), e);
                                 }
                             }
                             try {
-                                conn.close();
+                                conn.setAutoCommit(connAutoCommit);
                             } catch (SQLException e) {
                                 if (!scheduleThreadToStop) {
                                     logger.error(e.getMessage(), e);
                                 }
                             }
-                        }
-
-                        // close PreparedStatement
-                        if (null != preparedStatement) {
                             try {
-                                preparedStatement.close();
+                                conn.close();
                             } catch (SQLException e) {
                                 if (!scheduleThreadToStop) {
                                     logger.error(e.getMessage(), e);