From bdd73632eb1b44c2785ba4b25e9c91643a5cd38e Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@pivotal.io>
Date: Mon, 11 Apr 2016 08:39:15 -0500
Subject: [PATCH] Added context active check

---
 .../cloud/task/listener/TaskLifecycleListener.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
index e4b20a3c..8577223f 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
@@ -163,7 +163,7 @@ public class TaskLifecycleListener implements ApplicationListener<ApplicationEve
 			taskRepository.completeTaskExecution(taskExecution.getExecutionId(), taskExecution.getExitCode(),
 					taskExecution.getEndTime(), taskExecution.getExitMessage());
 
-			if(this.closeContext) {
+			if(this.closeContext && this.context.isActive()) {
 				this.context.close();
 			}
 		}