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

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
index bbd0961261a48a05b0e8c03c34c262bd4bfd2ea7..bc7312e517457186bd24feb46c722fa70c97db33 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java
@@ -84,10 +84,9 @@ public class JobRuntime extends Job implements IJobRuntime {
        private Semaphore forkSempahore;
        private IJobChangedListener spawnJobListener;
        private String currentStep;
-       // Fuggetlen (beagyazott) alfolyamatok
+       //Fuggetlen (beagyazott) alfolyamatok
        private List<JobRuntime> children;
-       // Parhuzamosan futtatot komplett job-ok, amiket bevarunk, ha a megfelelo step
-       // hivja + a forEach parhuzamositas
+       //Parhuzamosan futtatot komplett job-ok, amiket bevarunk, ha a megfelelo step hivja + a forEach parhuzamositas
        private List<Long> childrenIDs;
        private int spawnOrder;
 
@@ -112,7 +111,7 @@ public class JobRuntime extends Job implements IJobRuntime {
                submitted = job.getSubmitted();
                template = job.getTemplate();
                status = JobStatus.RUNABLE;
-               // CREATE notifikacio miatt
+               //CREATE notifikacio miatt
                setId(job.getId());
                addEventListener(listener);
        }
@@ -182,14 +181,14 @@ public class JobRuntime extends Job implements IJobRuntime {
                this.status = runtime.getStatus();
                this.ip = runtime.getIp();
                this.variables = new HashMap<>(runtime.getVariables());
-               super.setParameters(new ArrayList<Pair<String, Object>>(runtime.getParameters()));
+               super.setParameters(new HashMap<>(runtime.getParameters()));
                this.persister = runtime.getPersister();
                this.template = runtime.getTemplate();
                this.weight = runtime.getWeight();
                this.name = runtime.getName();
                this.owner = runtime.getOwner();
                program.removeAfter(getIp());
-               // logger.info("Program {}", program);
+               //logger.info("Program {}", program);
        }
 
        @Override
@@ -269,15 +268,12 @@ public class JobRuntime extends Job implements IJobRuntime {
 
                if (value == null) {
                        if (requiredType.isPrimitive())
-                               throw new IllegalArgumentException(
-                                               String.format("Null value for parameter %s (%s) is illegal.", name, requiredType));
+                               throw new IllegalArgumentException(String.format("Null value for parameter %s (%s) is illegal.", name, requiredType));
                } else {
                        Class<? extends Object> parameterValueType = value.getClass();
-                       if (!ClassUtils.isAssignable(parameterValueType, requiredType, true)
-                                       && !isRuntimeAssignable(parameterValueType, requiredType))
-                               throw new RuntimeException(
-                                               String.format("Got unassignable parameter value type (%s) for parameter %s (%s).",
-                                                               parameterValueType, name, requiredType));
+                       if (!ClassUtils.isAssignable(parameterValueType, requiredType, true) && !isRuntimeAssignable(parameterValueType, requiredType))
+                               throw new RuntimeException(String.format("Got unassignable parameter value type (%s) for parameter %s (%s).", parameterValueType, name,
+                                               requiredType));
                }
 
        }
@@ -323,7 +319,7 @@ public class JobRuntime extends Job implements IJobRuntime {
                                }
 
                                if (childrenIDs.contains(child.getId())) {
-                                       // logger.info("Child {} notification", child.getId());
+                                       //logger.info("Child {} notification", child.getId());
                                        if (event.getSignalType() == SignalType.UPDATE)
                                                if (finishedStates.contains(child.getStatus()))
                                                        removeSpanwChild(child.getId());
@@ -346,7 +342,7 @@ public class JobRuntime extends Job implements IJobRuntime {
 
        @Override
        public void forkWaitComplete() throws InterruptedException {
-               // atlagos mukodes
+               //atlagos mukodes
                if (forkSempahore == null)
                        return;
                logger.info("Waiting for semaphore {}", forkSempahore);
@@ -451,7 +447,7 @@ public class JobRuntime extends Job implements IJobRuntime {
                        result = getParameters().get(name);
                } catch (Exception e) {
                        logger.error(e);
-                       // TODO test!
+                       //TODO test!
                        throw e;
                }
                return result;
@@ -473,15 +469,13 @@ public class JobRuntime extends Job implements IJobRuntime {
        }
 
        /***
-        * Log session marker. A teljes folyamat osszes naplobejegyzese osszegyujtheto a
-        * segitsegevel. MediaCubeMarker tipusu, folyamatonkent uj peldany jon letre.
+        * Log session marker. A teljes folyamat osszes naplobejegyzese osszegyujtheto a segitsegevel. MediaCubeMarker tipusu, folyamatonkent uj peldany jon letre.
         */
        @Override
        public Marker getSessionMarker() {
                if (sessionMarker == null) {
                        sessionMarker = new MediaCubeMarker();
-                       sessionMarker
-                                       .setSessionID(getParentJobId() == 0 ? String.valueOf(getId()) : String.valueOf(getParentJobId()));
+                       sessionMarker.setSessionID(getParentJobId() == 0 ? String.valueOf(getId()) : String.valueOf(getParentJobId()));
                        sessionMarker.setSessionName(name);
                        sessionMarker.setUseSessionLog(getProgram().getTemplate().isUseSessionLog());
                        Marker parentMarker = MarkerManager.getMarker(template);
@@ -535,7 +529,7 @@ public class JobRuntime extends Job implements IJobRuntime {
 
        @Override
        public void incrementProgress(int progress) {
-               // remote ghost
+               //remote ghost
                if (program == null) {
                        setProgress(progress);
                        NotifyUpdate();
@@ -566,10 +560,10 @@ public class JobRuntime extends Job implements IJobRuntime {
                        setProgress((int) currentProgress);
                        NotifyUpdate();
                }
-               // if (currentProgress >= 96) {
-               // setProgress((int) currentProgress);
-               // NotifyUpdate();
-               // }
+               //              if (currentProgress >= 96) {
+               //                      setProgress((int) currentProgress);
+               //                      NotifyUpdate();
+               //              }
        }
 
        @Override
@@ -731,13 +725,16 @@ public class JobRuntime extends Job implements IJobRuntime {
        }
 
        /*
-        * private final EventListenerList listeners = new EventListenerList(); private
-        * List<JobRuntime> children; private MediaCubeMarker sessionMarker; private
-        * MediaCubeMarker finishMarker; private boolean isService; private Semaphore
-        * forkSempahore; private IJobChangedListener jobChangedListener; private
-        * List<Long> childrenIDs;
-        * 
-        */
+               private final EventListenerList listeners = new EventListenerList();
+               private List<JobRuntime> children;
+               private MediaCubeMarker sessionMarker;
+               private MediaCubeMarker finishMarker;
+               private boolean isService;
+               private Semaphore forkSempahore;
+               private IJobChangedListener jobChangedListener;
+               private List<Long> childrenIDs;
+       
+        * */
 
        @Override
        public void saveStatus() {