summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/lifecycle/instance/stateMachine
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2014-01-24 16:36:03 +0100
committerAndrew Branson <andrew.branson@cern.ch>2014-01-24 16:36:03 +0100
commitc8b9d2d31f0758951d912472be2cb3867b0c3dd6 (patch)
tree1c530aab7049cb68d4d3bd3a3a97765330a0b612 /src/main/java/com/c2kernel/lifecycle/instance/stateMachine
parentcf9699f4029ab8bf39b733be9013ac4c9c9b0076 (diff)
Tweak Admin predef step restriction. Set correct activity property.
Closes #152 Fix nulls in exceptions
Diffstat (limited to 'src/main/java/com/c2kernel/lifecycle/instance/stateMachine')
-rw-r--r--src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
index 704f2bf..455ab2d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
@@ -205,7 +205,7 @@ public class Transition implements Serializable {
// Decide the access
if (isOwned && !override && !isOwner)
throw new AccessRightsException("Agent '"+agent.getAgentName()
- +"' cannot perform this transition because the activity '"+act.getName()+"' is currently owned by "+agentName, null);
+ +"' cannot perform this transition because the activity '"+act.getName()+"' is currently owned by "+agentName, "");
if (role != null) {
if (agent.hasRole(role))
@@ -214,7 +214,7 @@ public class Transition implements Serializable {
return "Admin";
else
throw new AccessRightsException("Agent '"+agent.getAgentName()
- +"' does not hold a suitable role '"+role.getName()+"' for the activity "+act.getName(), null);
+ +"' does not hold a suitable role '"+role.getName()+"' for the activity "+act.getName(), "");
}
else
return null;