From ff6b40c02501f9ebd0ae1c38de4b38325fa616f2 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 9 Oct 2014 22:34:53 +0200
Subject: CorbaServer startup failure should throw a CannotManage instead of an
 InvalidData

---
 src/main/java/org/cristalise/kernel/entity/CorbaServer.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/cristalise/kernel/entity/CorbaServer.java b/src/main/java/org/cristalise/kernel/entity/CorbaServer.java
index a16d3d1..69f9a5c 100644
--- a/src/main/java/org/cristalise/kernel/entity/CorbaServer.java
+++ b/src/main/java/org/cristalise/kernel/entity/CorbaServer.java
@@ -23,11 +23,8 @@ package org.cristalise.kernel.entity;
 import java.util.Map;
 
 import org.cristalise.kernel.common.CannotManageException;
-import org.cristalise.kernel.common.InvalidDataException;
 import org.cristalise.kernel.common.ObjectAlreadyExistsException;
 import org.cristalise.kernel.common.ObjectNotFoundException;
-import org.cristalise.kernel.entity.AgentHelper;
-import org.cristalise.kernel.entity.ItemHelper;
 import org.cristalise.kernel.entity.agent.ActiveEntity;
 import org.cristalise.kernel.entity.agent.ActiveLocator;
 import org.cristalise.kernel.lookup.AgentPath;
@@ -59,7 +56,7 @@ public class CorbaServer {
     private POA         mAgentPOA;
     private POAManager  mPOAManager;
 
-    public CorbaServer() throws InvalidDataException {
+    public CorbaServer() throws CannotManageException {
         mItemCache   = new SoftCache<ItemPath, Servant>(50);
 
         // init POA
@@ -68,7 +65,7 @@ public class CorbaServer {
             mPOAManager.activate();
         } catch (Exception ex) {
             Logger.error(ex);
-            throw new InvalidDataException("Error initialising POA");
+            throw new CannotManageException("Error initialising POA");
         }
 
         new Thread(new Runnable() {
-- 
cgit v1.2.3