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/RemoveDomainPath.java      | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
index 3181249..0248650 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
@@ -25,8 +25,10 @@ package com.c2kernel.lifecycle.instance.predefined;
 
 import java.util.Arrays;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.CannotManage;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.ObjectCannotBeUpdated;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.DomainPath;
 import com.c2kernel.lookup.ItemPath;
@@ -44,29 +46,27 @@ public class RemoveDomainPath 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 {
 
     	String[] params = getDataList(requestData);
         if (Logger.doLog(3)) Logger.msg(3, "RemoveDomainPath: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));
-
+        if (params.length != 1) throw new InvalidData("RemoveDomainPath: Invalid parameters "+Arrays.toString(params));
+        
         DomainPath domainPath = new DomainPath(params[0]);
         if (!domainPath.exists())
-        	throw new InvalidDataException("RemoveDomainPath: Domain path "+domainPath.toString()+" does not exist.", "");
+        	throw new ObjectNotFound("RemoveDomainPath: Domain path "+domainPath.toString()+" does not exist.");
         	
         if (domainPath.getType()!=DomainPath.ENTITY)
         	
         try {
         	if (!domainPath.getItemPath().equals(item))
-        	throw new InvalidDataException("RemoveDomainPath: Domain path "+domainPath.toString()+" is not an alias of the current Item "+item, "");
-        } catch (ObjectNotFoundException ex) { 
-        	throw new InvalidDataException("RemoveDomainPath: Domain path "+domainPath.toString()+" is a context.", "");
-        }
-        try {
-        	LookupManager lookupManager = Gateway.getLookupManager();
-        	lookupManager.delete(domainPath);
-        	return requestData;
-        } catch (Exception ex) {
-        	throw unknownException(ex);
+        	throw new InvalidData("RemoveDomainPath: Domain path "+domainPath.toString()+" is not an alias of the current Item "+item);
+        } catch (ObjectNotFound ex) { 
+        	throw new InvalidData("RemoveDomainPath: Domain path "+domainPath.toString()+" is a context.");
         }
+
+        LookupManager lookupManager = Gateway.getLookupManager();
+        lookupManager.delete(domainPath);
+        return requestData;
     }
 }
-- 
cgit v1.2.3