From 853219f9adfd2a144d53b981f921ecea2e87c8ac Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Mon, 25 Apr 2022 23:40:19 +0000
Subject: [PATCH] dynamicStepsLoader beallitas idozitesi problema javitva

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33212
---
 .../server/JobEngineConfiguration.java        | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
index c13f8b6c..cbbb7b09 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
@@ -31,6 +31,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -70,20 +71,16 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 	private GroovyClassLoader groovyClassLoader;
 	private DynamicStepsLoader dynamicStepsLoader;
 
-	public JobEngineConfiguration() {
-
-		try {
-			String stepsDir = systemConfig.getConfig(DIR_STEPS);
-			dynamicStepsLoader = new DynamicStepsLoader(stepsDir);
-		} catch (Exception e) {
-			logger.warn(e.getMessage());
-		}
-	}
-
 	public synchronized void bindSystemConfiguration(Object service) {
 		if (service instanceof IConfiguration) {
 			systemConfig = (IConfiguration) service;
 			logger.info("IConfiguration service binded");
+			try {
+				String stepsDir = systemConfig.getConfig(DIR_STEPS);
+				dynamicStepsLoader = new DynamicStepsLoader(stepsDir);
+			} catch (Exception e) {
+				logger.warn(e.getMessage());
+			}
 		}
 	}
 
@@ -160,7 +157,11 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 		ScheduledJob sj = new ScheduledJob();
 		String name = jobJSON.getString("name");
 		String template = jobJSON.getString("template");
-		sj.setJobId(String.format("%s.%s", template, name));
+
+		// 220426 ha a name null, akkor nem regisztralhato tobbszor ugyan az a template
+		// sj.setJobId(String.format("%s.%s", template, name));
+		sj.setJobId(String.format("%s.%s", template, RandomStringUtils.randomAlphanumeric(8)));
+
 		if (StringUtils.isEmpty(name))
 			sj.setJobName(template);
 		else
-- 
2.54.0