[sre] Avoid NPE on the event bus listener when stoping the agent.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Mar 9, 2020 · 145ed53 · 145ed53
1 parent eac8574
commit 145ed53
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...roject/io.janusproject.plugin/src/main/sarl/io/sarl/sre/services/lifecycle/AgentLife.sarl b/...roject/io.janusproject.plugin/src/main/sarl/io/sarl/sre/services/lifecycle/AgentLife.sarl
@@ -257,6 +257,9 @@ final class AgentLife {
 		assert dyingAgent !== null
 
 		try {
+			// Copy the external event listener in order to unregistered it later.
+			var listener = this.eventBus.associatedEventBusListener
+
 			// Pre-stage for uninstalling the skills (BIC and user defined)
 			var skills : CopyOnWriteArraySet<? extends Skill>
 			try {
@@ -289,9 +292,6 @@ final class AgentLife {
 
 			enclosingContextsCopy += contexts
 
-			// Copy the external event listener in order to unregistered it later.
-			var listener = this.eventBus.associatedEventBusListener
-
 			// Final stage for uninstalling the skills (BIC and user defined)
 			try {
 				skillUninstaller.uninstallSkillsAfterDestroy(dyingAgent, skills)