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/CreateNewAgent.java | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
index 6caf25e..ffe8950 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.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.ImportAgent;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
 import com.c2kernel.lookup.AgentPath;
@@ -39,19 +43,25 @@ public class CreateNewAgent 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, ObjectNotFound, ObjectCannotBeUpdated, CannotManage, ObjectAlreadyExists {
     	
         String redactedRequestData;
-        try {
-            ImportAgent newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);
-            newAgent.create(agent, true);
-            newAgent.setPassword("REDACTED");
-            redactedRequestData = Gateway.getMarshaller().marshall(newAgent);
-            return redactedRequestData;
-        } catch (Exception ex) {
-            Logger.error(ex);
-            throw new InvalidDataException("Error creating agent", "");
-        }
 
+        ImportAgent newAgent;
+		try {
+			newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);
+		} catch (Exception e1) {
+			Logger.error(e1);
+			throw new InvalidData("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);
+		}
+        newAgent.create(agent, true);
+        newAgent.setPassword("REDACTED");
+        try {
+			redactedRequestData = Gateway.getMarshaller().marshall(newAgent);
+		} catch (Exception e) {
+			Logger.error(e);
+			throw new InvalidData("CreateNewAgent: Couldn't marshall new Agent for outcome: "+newAgent);
+		}
+        return redactedRequestData;
     }
 }
-- 
cgit v1.2.3