3.0-SNAPSHOT (Will be first open source version)

New StateMachine desc
IssueID #28

1 files changed, 7 insertions, 19 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/JobPusher.java b/src/main/java/com/c2kernel/lifecycle/instance/JobPusher.java
index 190758a..a0a51d0 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/JobPusher.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/JobPusher.java
@@ -1,13 +1,10 @@
 package com.c2kernel.lifecycle.instance;

 

 import java.util.Enumeration;

-import java.util.Iterator;

 

 import com.c2kernel.entity.Agent;

 import com.c2kernel.entity.AgentHelper;

-import com.c2kernel.entity.agent.Job;

 import com.c2kernel.entity.agent.JobArrayList;

-import com.c2kernel.lifecycle.instance.stateMachine.Transitions;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.RolePath;

 import com.c2kernel.process.Gateway;

@@ -16,16 +13,18 @@ import com.c2kernel.utils.Logger;
 final class JobPusher extends Thread {

     private final Activity activity;

     private final RolePath myRole;

+    private final int itemSysKey;

 

-    JobPusher(Activity activity, RolePath role) {

+    JobPusher(Activity activity, int itemSysKey, RolePath role) {

         this.activity = activity;

+        this.itemSysKey = itemSysKey;

         this.myRole = role;

     }

 

     @Override

 	public void run()

     {

-        Thread.currentThread().setName("Agent job pusher for "+activity.getName()+" to role "+myRole);

+        Thread.currentThread().setName("Agent job pusher for "+itemSysKey+":"+activity.getName()+" to role "+myRole);

     	for (Enumeration<AgentPath> e = myRole.getChildren(); e.hasMoreElements();)

     	{

             AgentPath nextAgent = e.nextElement();

@@ -33,25 +32,14 @@ final class JobPusher extends Thread {
     		try

     		{

     			// get joblist for user

-    			JobArrayList jobList = new JobArrayList(this.activity.calculateJobs(nextAgent, false));

-    			// only transmit start, complete and resume jobs

-    			for (Iterator<Job> element = jobList.list.iterator(); element.hasNext();)

-    			{

-    				Job thisJob = element.next();

-    				if (thisJob.getPossibleTransition() != Transitions.START

-    					&& thisJob.getPossibleTransition() != Transitions.COMPLETE

-                    && thisJob.getPossibleTransition() != Transitions.RESUME

-                    && thisJob.getPossibleTransition() != Transitions.SUSPEND

-                    && thisJob.getPossibleTransition() != Transitions.REASSIGN)

-    					element.remove();

-    			}

+    			JobArrayList jobList = new JobArrayList(this.activity.calculateJobs(nextAgent, itemSysKey, false));

     			Logger.msg(7, "Activity.pushJobsToAgents() - User will receive " + jobList.list.size() + " jobs");

     			String stringJobs = Gateway.getMarshaller().marshall(jobList);

     			// push it to the agent

     			org.omg.CORBA.Object agentIOR = nextAgent.getIOR();

     			Agent thisAgent = AgentHelper.narrow(agentIOR);

     			Logger.msg(7, "Calling agent "+thisAgent.getSystemKey()+" from "+activity.getPath());

-    			thisAgent.refreshJobList(this.activity.getItemEntityPath().getSysKey(), activity.getPath(), stringJobs);

+    			thisAgent.refreshJobList(itemSysKey, activity.getPath(), stringJobs);

     		}

     		catch (Exception ex)

     		{

@@ -61,7 +49,7 @@ final class JobPusher extends Thread {
     					+ " of role "

     					+ myRole

     					+ " could not be found to be informed of a change in "

-    					+ this.activity.getItemEntityPath().getSysKey());

+    					+ itemSysKey);

     			Logger.error(ex);

     		}

     	}