Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 4 insertions, 4 deletions

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 1ee5e8c..df1c44e 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveDomainPath.java
@@ -11,11 +11,10 @@ package com.c2kernel.lifecycle.instance.predefined;
 

 

 import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectCannotBeUpdated;

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.Lookup;

+import com.c2kernel.lookup.LookupManager;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -32,7 +31,7 @@ public class RemoveDomainPath extends PredefinedStep
 			int transitionID, String requestData) throws InvalidDataException {

 

         Logger.msg(8,"RemoveDomainPath::request()");

-        Lookup lookupManager = Gateway.getLookup();

+        

 

         Logger.msg(1,"RemoveDomainPath::request() - Starting.");

 

@@ -49,10 +48,11 @@ public class RemoveDomainPath extends PredefinedStep
         	throw new InvalidDataException("Domain path "+domainPath.toString()+" is a context.", "");

         }

         try {

+        	LookupManager lookupManager = Gateway.getLookupManager();

         	lookupManager.delete(domainPath);

         	Logger.msg(8,"AddAlias::request() - context:" + domainPath.toString() + " DONE.");

         	return requestData;

-        } catch (ObjectCannotBeUpdated ex) {

+        } catch (Exception ex) {

         	Logger.error(ex);

         	throw new InvalidDataException("Problem updating directory", "");

         }