Pre Merge pull request !17 from lingyun304/N/A

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 {
-
+                        // close PreparedStatement
-                        // commit
+                        if (null != preparedStatement) {
-                        if (conn != null) {
                             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);