From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001 From: Andrew Branson 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. --- src/main/java/com/c2kernel/process/module/ModuleManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/c2kernel/process/module/ModuleManager.java') diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 8153033..24dd610 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -27,8 +27,8 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Properties; -import com.c2kernel.common.InvalidDataException; -import com.c2kernel.common.ObjectNotFoundException; +import com.c2kernel.common.InvalidData; +import com.c2kernel.common.ObjectNotFound; import com.c2kernel.entity.proxy.AgentProxy; import com.c2kernel.entity.proxy.ItemProxy; import com.c2kernel.lookup.DomainPath; @@ -53,7 +53,7 @@ public class ModuleManager { Schema moduleSchema = new Schema("Module", 0, FileStringUtility.url2String(Gateway.getResource().getKernelResourceURL("boot/OD/Module.xsd"))); moduleValidator = new OutcomeValidator(moduleSchema); - } catch (InvalidDataException ex) { + } catch (InvalidData ex) { Logger.error(ex); throw new ModuleException("Module Schema is not valid"); } catch (IOException ex) { @@ -165,7 +165,7 @@ public class ModuleManager { ItemProxy serverEntity; try { serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getString("ItemServer.name"))); - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFound e) { throw new ModuleException("Cannot find local server name."); } Logger.debug(3, "Registering modules"); -- cgit v1.2.3