1 files changed, 40 insertions, 12 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java
index 6da695d75..437eee63c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessEngineImpl.java
@@ -15,7 +15,9 @@ import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.process.api.ExecutionContext;
 import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext;
 import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator;
@@ -116,10 +118,16 @@ public class ProcessEngineImpl implements ProcessEngine {
 	}
 
 	@Override
-	public void start(String processInstanceId) throws ProcessExecutionException {
-
+	public void start(IRequest pendingReq) throws ProcessExecutionException {
 		try {
-			ProcessInstance pi = loadProcessInstance(processInstanceId);
+			if (MiscUtil.isEmpty(pendingReq.getProcessInstanceId())) {
+				log.error("Pending-request with id:" + pendingReq.getRequestID() 
+					+ " includes NO 'ProcessInstanceId'");
+				throw new ProcessExecutionException("Pending-request with id:" + pendingReq.getRequestID() 
+					+ " includes NO 'ProcessInstanceId'");
+			}
+			
+			ProcessInstance pi = loadProcessInstance(pendingReq.getProcessInstanceId());
 
 			MDC.put(MDC_CTX_PI_NAME, pi.getId());
 
@@ -129,9 +137,12 @@ public class ProcessEngineImpl implements ProcessEngine {
 			log.info("Starting process instance '{}'.", pi.getId());
 			// execute process
 			pi.setState(ProcessInstanceState.STARTED);
-			execute(pi);
+			execute(pi, pendingReq);
 
-			saveOrUpdateProcessInstance(pi);
+			//store ProcessInstance if it is not already ended
+			if (!ProcessInstanceState.ENDED.equals(pi.getState()))
+				saveOrUpdateProcessInstance(pi);
+				
 		} catch (MOADatabaseException e) {
 			throw new ProcessExecutionException("Unable to load/save process instance.", e);
 
@@ -141,10 +152,17 @@ public class ProcessEngineImpl implements ProcessEngine {
 	}
 	
 	@Override
-	public void signal(String processInstanceId) throws ProcessExecutionException {
+	public void signal(IRequest pendingReq) throws ProcessExecutionException {
 
 		try {
-			ProcessInstance pi = loadProcessInstance(processInstanceId);
+			if (MiscUtil.isEmpty(pendingReq.getProcessInstanceId())) {
+				log.error("Pending-request with id:" + pendingReq.getRequestID() 
+					+ " includes NO 'ProcessInstanceId'");
+				throw new ProcessExecutionException("Pending-request with id:" + pendingReq.getRequestID() 
+					+ " includes NO 'ProcessInstanceId'");
+			}
+			
+			ProcessInstance pi = loadProcessInstance(pendingReq.getProcessInstanceId());
 
 			MDC.put(MDC_CTX_PI_NAME, pi.getId());
 
@@ -154,9 +172,16 @@ public class ProcessEngineImpl implements ProcessEngine {
 
 			log.info("Waking up process instance '{}'.", pi.getId());
 			pi.setState(ProcessInstanceState.STARTED);
-			execute(pi);
 
-			saveOrUpdateProcessInstance(pi);
+			//put pending-request ID on execution-context because it could be changed
+			pi.getExecutionContext().put(MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID, pendingReq.getRequestID());
+			
+			execute(pi, pendingReq);
+
+			//store ProcessInstance if it is not already ended
+			if (!ProcessInstanceState.ENDED.equals(pi.getState()))
+				saveOrUpdateProcessInstance(pi);
+						
 		} catch (MOADatabaseException e) {
 			throw new ProcessExecutionException("Unable to load/save process instance.", e);
 
@@ -204,9 +229,10 @@ public class ProcessEngineImpl implements ProcessEngine {
 	/**
 	 * Starts/executes a given process instance.
 	 * @param pi The process instance.
+	 * @param pendingReq 
 	 * @throws ProcessExecutionException Thrown in case of error.
 	 */
-	private void execute(final ProcessInstance pi) throws ProcessExecutionException {
+	private void execute(final ProcessInstance pi, IRequest pendingReq) throws ProcessExecutionException {
 		if (ProcessInstanceState.ENDED.equals(pi.getState())) {
 			throw new ProcessExecutionException("Process for instance '" + pi.getId() + "' has already been ended.");
 		}
@@ -227,7 +253,7 @@ public class ProcessEngineImpl implements ProcessEngine {
 					try {
 						log.info("Executing task implementation for task '{}'.", ti.getId());
 						log.debug("Execution context before task execution: {}", pi.getExecutionContext().keySet());
-						task.execute(pi.getExecutionContext());
+						pendingReq = task.execute(pendingReq, pi.getExecutionContext());
 						log.info("Returned from execution of task '{}'.", ti.getId());
 						log.debug("Execution context after task execution: {}", pi.getExecutionContext().keySet());
 					} catch (Throwable t) {
@@ -245,8 +271,10 @@ public class ProcessEngineImpl implements ProcessEngine {
 
 			try {
 				piStoreDao.remove(pi.getId());
+				
 			} catch (MOADatabaseException e) {
 				throw new ProcessExecutionException("Unable to remove process instance.", e);
+				
 			}
 			pi.setState(ProcessInstanceState.ENDED);
 			log.debug("Final process context: {}", pi.getExecutionContext().keySet());
@@ -284,7 +312,7 @@ public class ProcessEngineImpl implements ProcessEngine {
 		
 		// continue execution in case of StartEvent or Task
 		if (processNode instanceof StartEvent || processNode instanceof TaskInfo) {
-			execute(pi);
+			execute(pi, pendingReq);
 		}
 	}