deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject deltaspike git commit: DELTASPIKE-1002 removed implicit logic
Date Mon, 12 Oct 2015 07:59:41 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master ae3182b5a -> 02bc71397


DELTASPIKE-1002 removed implicit logic


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

Branch: refs/heads/master
Commit: 02bc7139765142c9346b8ece2d24df9584f5c30b
Parents: ae3182b
Author: gpetracek <gpetracek@apache.org>
Authored: Mon Oct 12 09:54:06 2015 +0200
Committer: gpetracek <gpetracek@apache.org>
Committed: Mon Oct 12 09:58:08 2015 +0200

----------------------------------------------------------------------
 .../apache/deltaspike/scheduler/impl/QuartzScheduler.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/02bc7139/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 bc6ed95..44e6417 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
@@ -439,14 +439,16 @@ public class QuartzScheduler implements Scheduler<Job>
 
         private void stopStartedScopes()
         {
-            while (!this.scopes.empty())
+            if (this.contextControl == null)
             {
-                this.contextControl.get().stopContext(this.scopes.pop());
+                return;
             }
-            if (this.contextControl != null)
+
+            while (!this.scopes.empty())
             {
-                this.contextControl.destroy();
+                this.contextControl.get().stopContext(this.scopes.pop());
             }
+            this.contextControl.destroy();
         }
     }
 


Mime
View raw message