From 123db9841af0819a88d10140c96a90fb5d95dfeb Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 18 Jun 2013 23:21:13 +0200 Subject: Report exception properly in CreateItemFromDescription Initialize new workflows in ReplaceDomainWorkflow --- .../lifecycle/instance/predefined/CreateItemFromDescription.java | 2 +- .../lifecycle/instance/predefined/ReplaceDomainWorkflow.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/c2kernel') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java index ff049f4..ce5ec73 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java @@ -78,7 +78,7 @@ public class CreateItemFromDescription extends PredefinedStep DomainPath context = new DomainPath(new DomainPath(domPath), newName); Logger.debug(8,"context "+context.getSysKey()+" "+context.getPath()+" "+context.getString()); if (context.getSysKey()!=-1) - throw new ObjectAlreadyExistsException("The item name " +newName+ " exists already."); + throw new ObjectAlreadyExistsException("The item name " +newName+ " exists already.", ""); // get init objects String[] collNames = storage.getClusterContents(myPath.getSysKey(), ClusterStorage.COLLECTION); diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java index 6a50d18..77ed919 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java @@ -30,17 +30,19 @@ public class ReplaceDomainWorkflow extends PredefinedStep try { - Logger.msg(8, "ReplaceDomainWorkflow::request() - data:" + getDataList(requestData)[0]); lifeCycle.getChildGraphModel().removeVertex(lifeCycle.search("workflow/domain")); CompositeActivity domain = (CompositeActivity) Gateway.getMarshaller().unmarshall(getDataList(requestData)[0]); domain.setName("domain"); lifeCycle.initChild(domain, true, new GraphPoint(150, 100)); + // if new workflow, activate it, otherwise refresh the jobs + if (!domain.active) lifeCycle.run(agent); + else lifeCycle.refreshJobs(); + + // store new wf Gateway.getStorage().put(getItemEntityPath().getSysKey(), lifeCycle, null); Logger.msg(1, "ReplaceDomainWorkflow::request() - DONE."); sendEventStoreOutcome(transitionID, requestData, agent); - // refresh jobs - lifeCycle.refreshJobs(); } catch (Exception ex) { -- cgit v1.2.3