From c8b9d2d31f0758951d912472be2cb3867b0c3dd6 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 24 Jan 2014 16:36:03 +0100 Subject: Tweak Admin predef step restriction. Set correct activity property. Closes #152 Fix nulls in exceptions --- .../java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java') 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; -- cgit v1.2.3