From: Sweidan Omar Date: Thu, 28 Apr 2022 08:13:12 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=1f87e378914d7ef3249f4af81eb821aec63f2e29;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33225 --- diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java index e0e7ff1e..af5db131 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java @@ -577,35 +577,34 @@ public class JobEngine implements IJobEngine { // vegigmenni a submittedJobs-on! - Set ids = submittedJobs.keySet(); + Set ids = submittedJobs.keySet(); for (long id : ids) { if (!submittedJobs.containsKey(id)) continue; - + IJobRuntime runtime = submittedJobs.get(id); if (runtime == null) continue; if (!template.getFileName().equals(runtime.getTemplate())) continue; - - //'EXECUTING', 'WAIT_EXECUTOR', 'WAIT_SUSPEND', 'RUNNABLE' - if(runtime.isExecuting() || runtime.isRunnable() || runtime.isWaitingSuspend()|| runtime.isWaitingExecutor()) + + // 'EXECUTING', 'WAIT_EXECUTOR', 'WAIT_SUSPEND', 'RUNNABLE' + if (runtime.isExecuting() || runtime.isRunnable() || runtime.isWaitingSuspend() + || runtime.isWaitingExecutor()) throw new JobEngineException(String.format("Can not submit job. Job with %s.%s already running", template.getFileName(), template.getName())); } -/* - List runningJobs = itemManager.getRunningJobs(template.getFileName()); - if (runningJobs != null) { - for (Job job : runningJobs) { - Job runningJob = getJob(job.getId()); - - if (runningJob != null && runningJob.getStatus() != JobStatus.SUSPENDED) - throw new JobEngineException(String.format("Can not submit job. Job with %s.%s already running", - template.getFileName(), template.getName())); - } - } -*/ + /* + * List runningJobs = itemManager.getRunningJobs(template.getFileName()); + * if (runningJobs != null) { for (Job job : runningJobs) { Job runningJob = + * getJob(job.getId()); + * + * if (runningJob != null && runningJob.getStatus() != JobStatus.SUSPENDED) + * throw new JobEngineException(String. + * format("Can not submit job. Job with %s.%s already running", + * template.getFileName(), template.getName())); } } + */ } @Override