From e1d22533d1178eeca4fc4c9a9a1d49c03d25659f Mon Sep 17 00:00:00 2001 From: montlikadani Date: Mon, 13 Apr 2020 14:56:12 +0200 Subject: [PATCH] Only count the jobIds from database to prevent workers are set to 1 if there is no workers --- .../java/com/gamingmesh/jobs/dao/JobsDAO.java | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java index 93a757f8..79acdd67 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java @@ -1190,28 +1190,13 @@ public abstract class JobsDAO { PreparedStatement prest = null; ResultSet res = null; try { - prest = conn.prepareStatement("SELECT COUNT(*) FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.job + "` = ?;"); - prest.setString(1, JobName); - res = prest.executeQuery(); - if (res.next()) { - count += res.getInt(1); - } - - if (count == 0) { - close(prest); - close(res); - - prest = null; - res = null; - - Job job = Jobs.getJob(JobName); - if (job != null && job.getId() != 0) { - prest = conn.prepareStatement("SELECT COUNT(*) FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.jobid + "` = ?;"); - prest.setInt(1, job.getId()); - res = prest.executeQuery(); - if (res.next()) { - count += res.getInt(1); - } + Job job = Jobs.getJob(JobName); + if (job != null && job.getId() != 0) { + prest = conn.prepareStatement("SELECT COUNT(*) FROM `" + getJobsTableName() + "` WHERE `" + JobsTableFields.jobid + "` = ?;"); + prest.setInt(1, job.getId()); + res = prest.executeQuery(); + if (res.next()) { + count += res.getInt(1); } } } catch (SQLException e) {