dynamicStepsLoader beallitas idozitesi problema javitva

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33212

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 c13f8b6c5c8855f86742b4125b02e945318aec96..cbbb7b09db717557217046bdcd6318adbae868ee 100644 (file)
--- 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;\r
 import javax.xml.transform.stream.StreamResult;\r
 \r
+import org.apache.commons.lang.RandomStringUtils;\r
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
@@ -70,20 +71,16 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
        private GroovyClassLoader groovyClassLoader;\r
        private DynamicStepsLoader dynamicStepsLoader;\r
 \r
-       public JobEngineConfiguration() {\r
-\r
-               try {\r
-                       String stepsDir = systemConfig.getConfig(DIR_STEPS);\r
-                       dynamicStepsLoader = new DynamicStepsLoader(stepsDir);\r
-               } catch (Exception e) {\r
-                       logger.warn(e.getMessage());\r
-               }\r
-       }\r
-\r
        public synchronized void bindSystemConfiguration(Object service) {\r
                if (service instanceof IConfiguration) {\r
                        systemConfig = (IConfiguration) service;\r
                        logger.info("IConfiguration service binded");\r
+                       try {\r
+                               String stepsDir = systemConfig.getConfig(DIR_STEPS);\r
+                               dynamicStepsLoader = new DynamicStepsLoader(stepsDir);\r
+                       } catch (Exception e) {\r
+                               logger.warn(e.getMessage());\r
+                       }\r
                }\r
        }\r
 \r
@@ -160,7 +157,11 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
                ScheduledJob sj = new ScheduledJob();\r
                String name = jobJSON.getString("name");\r
                String template = jobJSON.getString("template");\r
-               sj.setJobId(String.format("%s.%s", template, name));\r
+\r
+               // 220426 ha a name null, akkor nem regisztralhato tobbszor ugyan az a template\r
+               // sj.setJobId(String.format("%s.%s", template, name));\r
+               sj.setJobId(String.format("%s.%s", template, RandomStringUtils.randomAlphanumeric(8)));\r
+\r
                if (StringUtils.isEmpty(name))\r
                        sj.setJobName(template);\r
                else\r