X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FProcessThread.java;h=5552d664e9a5f01bd180fc9a248e270ec6e2d29c;hb=af9457b0628ba4cc625192762d0c0fe7564b9846;hp=8e7584b2bff8bb7fbf4b790cffa7eec0d59fe79c;hpb=57aa5d64fb38af2d98076eeaaa11573b3147cc26;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
index 8e7584b2b..5552d664e 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
@@ -31,6 +31,10 @@ import org.argeo.slc.execution.RealizedFlow;
 import org.springframework.security.Authentication;
 import org.springframework.security.context.SecurityContextHolder;
 
+/**
+ * Main thread coordinating an {@link ExecutionProcess}, launching parallel or
+ * sequential {@link ExecutionThread}s.
+ */
 public class ProcessThread extends Thread {
 	private final static Log log = LogFactory.getLog(ProcessThread.class);
 
@@ -41,7 +45,7 @@ public class ProcessThread extends Thread {
 	private Set<ExecutionThread> executionThreads = Collections
 			.synchronizedSet(new HashSet<ExecutionThread>());
 
-	private Boolean hadAnError = false;
+	// private Boolean hadAnError = false;
 	private Boolean killed = false;
 
 	public ProcessThread(ThreadGroup processesThreadGroup,
@@ -50,8 +54,7 @@ public class ProcessThread extends Thread {
 		super(processesThreadGroup, "SLC Process #" + process.getUuid());
 		this.executionModulesManager = executionModulesManager;
 		this.process = process;
-		processThreadGroup = new ProcessThreadGroup(executionModulesManager,
-				this);
+		processThreadGroup = new ProcessThreadGroup(process);
 	}
 
 	public final void run() {
@@ -71,10 +74,10 @@ public class ProcessThread extends Thread {
 		// Start logging
 		new LoggingThread().start();
 
-		String oldStatus = process.getStatus();
+		// String oldStatus = process.getStatus();
 		process.setStatus(ExecutionProcess.RUNNING);
-		executionModulesManager.dispatchUpdateStatus(process, oldStatus,
-				ExecutionProcess.RUNNING);
+		// executionModulesManager.dispatchUpdateStatus(process, oldStatus,
+		// ExecutionProcess.RUNNING);
 
 		try {
 			process();
@@ -101,16 +104,16 @@ public class ProcessThread extends Thread {
 
 	/** Make sure this is called BEFORE all the threads are interrupted. */
 	private void computeFinalStatus() {
-		String oldStatus = process.getStatus();
+		// String oldStatus = process.getStatus();
 		// TODO: error management at flow level?
 		if (killed)
 			process.setStatus(ExecutionProcess.KILLED);
-		else if (hadAnError)
+		else if (processThreadGroup.hadAnError())
 			process.setStatus(ExecutionProcess.ERROR);
 		else
 			process.setStatus(ExecutionProcess.COMPLETED);
-		executionModulesManager.dispatchUpdateStatus(process, oldStatus,
-				process.getStatus());
+		// executionModulesManager.dispatchUpdateStatus(process, oldStatus,
+		// process.getStatus());
 		log.info("\n## SLC Process #" + process.getUuid() + " "
 				+ process.getStatus() + "\n");
 	}
@@ -148,7 +151,8 @@ public class ProcessThread extends Thread {
 		if (killed)
 			return;
 
-		ExecutionThread thread = new ExecutionThread(this, realizedFlow);
+		ExecutionThread thread = new ExecutionThread(processThreadGroup,
+				executionModulesManager, realizedFlow);
 		executionThreads.add(thread);
 		thread.start();
 
@@ -158,13 +162,13 @@ public class ProcessThread extends Thread {
 		return;
 	}
 
-	public void notifyError() {
-		hadAnError = true;
-	}
-
-	public synchronized void flowCompleted() {
-		// notifyAll();
-	}
+//	public void notifyError() {
+//		hadAnError = true;
+//	}
+//
+//	public synchronized void flowCompleted() {
+//		// notifyAll();
+//	}
 
 	public ExecutionProcess getProcess() {
 		return process;