Repository: deltaspike
Updated Branches:
  refs/heads/master 6bef4aca2 -> 16b77919b


DELTASPIKE-1124 optimized handling in case of DynamicExpressionObserverJob


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

Branch: refs/heads/master
Commit: 16b77919b71b28eb2d4d06a2740c9aeec94cfe58
Parents: 6bef4ac
Author: gpetracek <gpetra...@apache.org>
Authored: Sat Apr 9 23:54:48 2016 +0200
Committer: gpetracek <gpetra...@apache.org>
Committed: Sat Apr 9 23:54:48 2016 +0200

----------------------------------------------------------------------
 .../deltaspike/scheduler/impl/AbstractQuartzScheduler.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/16b77919/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
----------------------------------------------------------------------
diff --git 
a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
 
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
index f668b79..188682a 100644
--- 
a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
+++ 
b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractQuartzScheduler.java
@@ -446,11 +446,16 @@ public abstract class AbstractQuartzScheduler<T> 
implements Scheduler<T>
             Scheduled scheduled = jobClass.getAnnotation(Scheduled.class);
 
             //can happen with manually registered job-instances (via #unwrap)
-            if (scheduled == null)
+            if (scheduled == null && 
!jobClass.equals(DynamicExpressionObserverJob.class))
             {
                 scheduled = DEFAULT_SCHEDULED_LITERAL;
             }
 
+            if (scheduled == null)
+            {
+                return;
+            }
+
             JobListenerContext jobListenerContext = new JobListenerContext();
             currentJobListenerContext.set(jobListenerContext);
             jobListenerContext.startContexts(scheduled);

Reply via email to