From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:30:41 +0200
Subject: Huge exception overhaul: Merged ClusterStorageException with
 PersistencyException. Replaced MembershipException with
 InvalidCollectionModification CORBA Exception. Made all predef steps throw
 more accurate exceptions when they go wrong, and let more exceptions bubble
 through from underneath.

---
 .../instance/predefined/server/CreateNewRole.java  | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
index 49231ea..de05dec 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
@@ -20,7 +20,11 @@
  */
 package com.c2kernel.lifecycle.instance.predefined.server;
 
-import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.CannotManage;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.ObjectAlreadyExists;
+import com.c2kernel.common.ObjectCannotBeUpdated;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.entity.imports.ImportRole;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
 import com.c2kernel.lookup.AgentPath;
@@ -39,16 +43,17 @@ public class CreateNewRole extends PredefinedStep
 	//requestdata is xmlstring
     @Override
 	protected String runActivityLogic(AgentPath agent, ItemPath item,
-			int transitionID, String requestData) throws InvalidDataException {
+			int transitionID, String requestData) throws InvalidData, ObjectAlreadyExists, ObjectCannotBeUpdated, CannotManage, ObjectNotFound {
     	
-        try {
-            ImportRole newRole = (ImportRole)Gateway.getMarshaller().unmarshall(requestData);
-            newRole.create(agent, true);
-            return requestData;
-        } catch (Exception ex) {
-            Logger.error(ex);
-            throw new InvalidDataException("Error creating role", "");
-        }
 
+    	ImportRole newRole;
+		try {
+			newRole = (ImportRole)Gateway.getMarshaller().unmarshall(requestData);
+		} catch (Exception e) {
+			Logger.error(e);
+			throw new InvalidData("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);
+		}
+    	newRole.create(agent, true);
+    	return requestData;
     }
 }
-- 
cgit v1.2.3