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/AddDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
index a931143..585f96f 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -2,6 +2,7 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 

 import java.util.Stack;

 

+import com.c2kernel.common.CannotManageException;

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectAlreadyExistsException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

@@ -35,12 +36,14 @@ public class AddDomainContext extends PredefinedStep {
 		while(!pathsToAdd.empty()) {

 			pathToAdd = pathsToAdd.pop();

 			try {

-				Gateway.getLookup().add(pathToAdd);

+				Gateway.getLookupManager().add(pathToAdd);

 			} catch (ObjectAlreadyExistsException e) {

 				Logger.error("Context "+pathToAdd+" inconsistently exists.");

 			} catch (ObjectCannotBeUpdated e) {

 				Logger.error(e);

 				throw new InvalidDataException("Exception adding path "+pathToAdd+": "+e.getMessage(), "");

+			} catch (CannotManageException e) {

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

 			}

 		}

 		return requestData;