From 6244fae0aeb2e0986593387ed8fece48fba847fd Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 23 Jul 2014 11:08:05 +0200 Subject: Move openldap files to ldap package Mark execute(ItemProxy, Job) non-public - should not be part of API, Jobs are fixed to a particular Item. Check null on module manager before calling shutdown scripts during close(). Remove auto-generated lines in ObjectProperties --- src/main/java/com/c2kernel/entity/proxy/AgentProxy.java | 2 +- src/main/java/com/c2kernel/process/Gateway.java | 3 ++- src/main/java/com/c2kernel/utils/ObjectProperties.java | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java index e5a52f0..173f239 100644 --- a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java +++ b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java @@ -92,7 +92,7 @@ public class AgentProxy extends ItemProxy * @param job - the job to execute * @throws ScriptErrorException */ - public String execute(ItemProxy item, Job job) + protected String execute(ItemProxy item, Job job) throws AccessRightsException, InvalidTransitionException, ObjectNotFoundException, diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index adbaeb6..8a34e72 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -281,7 +281,8 @@ public class Gateway public static void close() { // run shutdown module scripts - mModules.runScripts("shutdown"); + if (mModules != null) + mModules.runScripts("shutdown"); // shut down servers if running if (mCorbaServer != null) diff --git a/src/main/java/com/c2kernel/utils/ObjectProperties.java b/src/main/java/com/c2kernel/utils/ObjectProperties.java index 731b009..8dacd2c 100644 --- a/src/main/java/com/c2kernel/utils/ObjectProperties.java +++ b/src/main/java/com/c2kernel/utils/ObjectProperties.java @@ -6,12 +6,10 @@ import java.util.Properties; public class ObjectProperties extends Properties { public ObjectProperties() { - // TODO Auto-generated constructor stub } public ObjectProperties(Properties defaults) { super(defaults); - // TODO Auto-generated constructor stub } public String getString(String propName) { -- cgit v1.2.3