[sre] Avoid any killAgent() run when the agent is already dying.

Signed-off-by: Stéphane Galland <galland@arakhne.org>

sre/io.janusproject/io.janusproject.plugin/src/main/sarl/io/sarl/sre/services/lifecycle/AbstractLifecycleService.sarl

@@ -168,24 +168,6 @@ abstract class AbstractLifecycleService extends AbstractSreService implements Li
 		]
 	}
 
-	def isKillableAgent(^agent : Agent) : boolean {
-		try {
-			var innerContext = getLifeOrNull(^agent)?.innerContext
-			if (innerContext !== null) {
-				var participants = innerContext.defaultSpace.participants
-				if (participants !== null) {
-
-					if (participants.size > 1 || (participants.size == 1 && !participants.contains(^agent.ID))) {
-						return false
-					}
-
-				}
-			}
-			return true
-		} catch (exception : Throwable) {
-			return false
-		}
-	}
 	def spawnAgent(nbAgents : int, spawningAgent : UUID, parent : Context, agentId : UUID,
 		agentClazz : Class<? extends Agent>, callback : LifecycleSpawnCallback, params : Object*) {
 		spawnAgent(nbAgents, spawningAgent, parent, agentClazz, callback, params) [
@@ -338,15 +320,60 @@ abstract class AbstractLifecycleService extends AbstractSreService implements Li
 		context !== null && context.rootContext && context.defaultSpace.participants.empty
 	}
 
+	/** Replies if the given agent could be kill according to the SARL specification.
+	 *
+	 * <p>An agent could be kill if is has no internal member.
+	 *
+	 * @param life the internal data structure for the agent.
+	 * @param id the identifier of the agent.
+	 * @return {@code true} if the agent could be killed.
+	 */
+	def isKillableAgent(life : AgentLife, id : UUID) : boolean {
+		if (life !== null) {
+			try {
+				var innerContext = life.innerContext
+				if (innerContext !== null) {
+					var participants = innerContext.defaultSpace.participants
+					if (participants !== null) {
+
+						if (participants.size > 1 || (participants.size == 1 && !participants.contains(id))) {
+							return false
+						}
+
+					}
+				}
+				return true
+			} catch (exception : Throwable) {
+				//
+			}
+		}
+		return false
+	}
+
+	/** Replies if the agent is alive. This function is usually invoked to determine if the agent is killable.
+	 * 
+	 * @param life the internal data structure for the agent.
+	 * @return {@code true} if the agent is alive.
+	 * @since 0.11
+	 */
+	def isAlive(life : AgentLife) : boolean {
+		life.state.isAlive
+	}
+
 	def killAgent(^agent : Agent) : boolean {
 		// We should check if it is possible to kill the agent BEFORE killing it.
-		if (this.running && ^agent.isKillableAgent()) {
-			var life = getLife(^agent)
-			var defaultContext = life.defaultContext
-			var contexts = life.stop(this.skillUninstaller, getLoggingService)
-			^agent.onAgentKilled
-			fireAgentDestructionEvents(^agent, defaultContext, contexts)
-			return true
+		if (this.running) {
+			val life = getLifeOrNull(^agent)
+			if (life !== null) {
+				val agentId = ^agent.ID
+				if (life.isAlive && life.isKillableAgent(agentId)) {
+					var defaultContext = life.defaultContext
+					var contexts = life.stop(this.skillUninstaller, getLoggingService)
+					^agent.onAgentKilled
+					fireAgentDestructionEvents(^agent, defaultContext, contexts)
+					return true
+				}
+			}
 		}
 
 		return false

sre/io.janusproject/io.janusproject.plugin/src/main/sarl/io/sarl/sre/services/lifecycle/LifecycleService.sarl

@@ -71,19 +71,6 @@ interface LifecycleService extends Service {
 	 */
 	def killAgent(^agent : Agent) : boolean
 
-	/** 
-	 * Replies if the given agent could be killed
-	 * 
-	 * <p>An agent could be killed only if it does not contain sub-agents.
-	 * 
-	 * <p>Because the agent reference is passed to this function, only the objects which have this reference
-	 * could kill the agent.
-	 * 
-	 * @param agent the agent to kill.
-	 * @return {@code true} if the agent could be killed.
-	 */
-	def isKillableAgent(^agent : Agent) : boolean
-
 	/** 
 	 * Add a listener on the changes in the current state of an agent.
 	 *