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.

---
 .../predefined/server/AddDomainContext.java        | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
index 3cb2182..57de2a1 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -20,11 +20,12 @@
  */
 package com.c2kernel.lifecycle.instance.predefined.server;
 
+import java.util.Arrays;
 import java.util.Stack;
 
-import com.c2kernel.common.CannotManageException;
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectAlreadyExistsException;
+import com.c2kernel.common.CannotManage;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.ObjectAlreadyExists;
 import com.c2kernel.common.ObjectCannotBeUpdated;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
 import com.c2kernel.lookup.AgentPath;
@@ -41,13 +42,15 @@ public class AddDomainContext extends PredefinedStep {
 	
 	@Override
 	protected String runActivityLogic(AgentPath agent, ItemPath item,
-			int transitionID, String requestData) throws InvalidDataException {
+			int transitionID, String requestData) throws InvalidData, ObjectCannotBeUpdated, ObjectAlreadyExists, CannotManage {
 	
-		Logger.msg(1, "AddDomainContext::request() - Starting.");
+		String[] params = getDataList(requestData);
+        if (Logger.doLog(3)) Logger.msg(3, "AddDomainContext: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
+        if (params.length != 1) throw new InvalidData("AddDomainContext: Invalid parameters "+Arrays.toString(params));
 		
-		DomainPath pathToAdd = new DomainPath(getDataList(requestData)[0]);
+		DomainPath pathToAdd = new DomainPath(params);
 		if (pathToAdd.exists())
-			throw new InvalidDataException("Context "+pathToAdd+" already exists", "");
+			throw new ObjectAlreadyExists("Context "+pathToAdd+" already exists");
 		// collect parent paths if they don't exist
 		Stack<DomainPath> pathsToAdd = new Stack<DomainPath>();
 		while(pathToAdd!= null && !pathToAdd.exists()) { 
@@ -56,16 +59,7 @@ public class AddDomainContext extends PredefinedStep {
 		}
 		while(!pathsToAdd.empty()) {
 			pathToAdd = pathsToAdd.pop();
-			try {
-				Gateway.getLookupManager().add(pathToAdd);
-			} catch (ObjectAlreadyExistsException e) {
-				Logger.error("Context "+pathToAdd+" inconsistently exists.");
-			} catch (ObjectCannotBeUpdated e) {
-				Logger.error(e);
-				throw new InvalidDataException("Exception adding path "+pathToAdd+": "+e.getMessage(), "");
-			} catch (CannotManageException e) {
-				throw new InvalidDataException("Cannot alter directory in a non-server process", "");
-			}
+			Gateway.getLookupManager().add(pathToAdd);
 		}
 		return requestData;
 	}
-- 
cgit v1.2.3