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/AddDomainPath.java         | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
index d838aa7..1067911 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddDomainPath.java
@@ -25,7 +25,10 @@ package com.c2kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-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.lookup.AgentPath;
 import com.c2kernel.lookup.DomainPath;
 import com.c2kernel.lookup.ItemPath;
@@ -43,22 +46,16 @@ public class AddDomainPath 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, ObjectCannotBeUpdated, ObjectAlreadyExists, CannotManage {
     	
     	String[] params = getDataList(requestData);
         if (Logger.doLog(3)) Logger.msg(3, "AddDomainPath: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
+        if (params.length != 1) throw new InvalidData("AddDomainPath: Invalid parameters "+Arrays.toString(params));
 
-        try
-        {
-            LookupManager lookupManager = Gateway.getLookupManager();
-            DomainPath domainPath = new DomainPath(params[0], item);
-            lookupManager.add(domainPath);
-            return requestData;
-        }
-        catch( Exception ex )
-        {
-        	throw unknownException(ex);
-        }
+        LookupManager lookupManager = Gateway.getLookupManager();
 
+        DomainPath domainPath = new DomainPath(params[0], item);
+        lookupManager.add(domainPath);
+        return requestData;
     }
 }
-- 
cgit v1.2.3