deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject deltaspike git commit: DELTASPIKE-1002 Added null check for context control before stopping scopes.
Date Mon, 12 Oct 2015 02:37:23 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 40cc44418 -> ae3182b5a


DELTASPIKE-1002 Added null check for context control before stopping scopes.


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ae3182b5
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ae3182b5
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ae3182b5

Branch: refs/heads/master
Commit: ae3182b5ad977853872ee39e69d39773dcad56bc
Parents: 40cc444
Author: John D. Ament <johndament@apache.org>
Authored: Sun Oct 11 22:37:29 2015 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Sun Oct 11 22:37:29 2015 -0400

----------------------------------------------------------------------
 .../org/apache/deltaspike/scheduler/impl/QuartzScheduler.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ae3182b5/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
index 8ef3cc2..bc6ed95 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
@@ -443,7 +443,10 @@ public class QuartzScheduler implements Scheduler<Job>
             {
                 this.contextControl.get().stopContext(this.scopes.pop());
             }
-            this.contextControl.destroy();
+            if (this.contextControl != null)
+            {
+                this.contextControl.destroy();
+            }
         }
     }
 


Mime
View raw message