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.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/entity/imports/ImportRole.java b/src/main/java/com/c2kernel/entity/imports/ImportRole.java
index 25e6c36..2c24887 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportRole.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportRole.java
@@ -22,10 +22,10 @@ package com.c2kernel.entity.imports;
 

 import java.util.Iterator;

 

-import com.c2kernel.common.CannotManageException;

-import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.CannotManage;

+import com.c2kernel.common.ObjectAlreadyExists;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.Path;

 import com.c2kernel.lookup.RolePath;

@@ -40,7 +40,7 @@ public class ImportRole extends ModuleImport {
 	}

 	

 	@Override

-	public void create(AgentPath agentPath, boolean reset) throws ObjectAlreadyExistsException, ObjectCannotBeUpdated, CannotManageException, ObjectNotFoundException {

+	public void create(AgentPath agentPath, boolean reset) throws ObjectAlreadyExists, ObjectCannotBeUpdated, CannotManage, ObjectNotFound {

 		RolePath parent = new RolePath();

 		if (name.indexOf('/') > -1) {

 			String[] roleComp = name.split("/");

@@ -55,7 +55,7 @@ public class ImportRole extends ModuleImport {
 						break;

 					}

 				}

-				if (!found) throw new ObjectNotFoundException("Parent role "+roleComp[i]+" was not found", "");

+				if (!found) throw new ObjectNotFound("Parent role "+roleComp[i]+" was not found");

 			}

 			name = roleComp[roleComp.length-1];

 		}