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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
index a55f7dd..956166a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
@@ -1,5 +1,6 @@
 package com.c2kernel.lifecycle.instance.predefined.server;

 

+import com.c2kernel.common.CannotManageException;

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

 import com.c2kernel.common.ObjectNotFoundException;

@@ -31,10 +32,12 @@ public class RemoveDomainContext extends PredefinedStep {
 			throw new InvalidDataException("Context "+pathToDelete+" is not empty. Cannot delete.", "");

 		

 		try {

-			Gateway.getLookup().delete(pathToDelete);

+			Gateway.getLookupManager().delete(pathToDelete);

 		} catch (ObjectCannotBeUpdated e) {

 			Logger.error(e);

 			throw new InvalidDataException("Exception deleting path"+pathToDelete+": "+e.getMessage(), "");

+		} catch (CannotManageException e) {

+			throw new InvalidDataException("Cannot alter directory in a non-server process", "");

 		}

 		return requestData;

 	}