You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/03/14 16:22:56 UTC
svn commit: r1456478 - in /syncope/trunk:
core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
pom.xml
Author: ilgrosso
Date: Thu Mar 14 15:22:56 2013
New Revision: 1456478
URL: http://svn.apache.org/r1456478
Log:
Upgrade to Quartz 2.1.7
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
syncope/trunk/pom.xml
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java?rev=1456478&r1=1456477&r2=1456478&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java Thu Mar 14 15:22:56 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.init;
import java.text.ParseException;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -114,9 +113,7 @@ public class JobInstanceLoader {
synchronized (scheduler.getScheduler()) {
boolean jobAlreadyRunning = false;
- for (JobExecutionContext jobCtx : (List<JobExecutionContext>) scheduler.getScheduler().
- getCurrentlyExecutingJobs()) {
-
+ for (JobExecutionContext jobCtx : scheduler.getScheduler().getCurrentlyExecutingJobs()) {
if (jobName.equals(jobCtx.getJobDetail().getKey().getName())
&& Scheduler.DEFAULT_GROUP.equals(jobCtx.getJobDetail().getKey().getGroup())) {
@@ -145,6 +142,8 @@ public class JobInstanceLoader {
// 3. Trigger
if (cronExpression == null) {
+ // Jobs added with no trigger must be durable
+ jobDetail.setDurability(true);
scheduler.getScheduler().addJob(jobDetail, true);
} else {
CronTriggerImpl cronTrigger = new CronTriggerImpl();
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1456478&r1=1456477&r2=1456478&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Mar 14 15:22:56 2013
@@ -297,7 +297,7 @@ under the License.
<jackson.version>1.9.12</jackson.version>
<xstream.version>1.4.4</xstream.version>
<velocity.version>1.7</velocity.version>
- <quartz.version>2.1.6</quartz.version>
+ <quartz.version>2.1.7</quartz.version>
<openjpa.version>2.2.1</openjpa.version>
<bval.version>0.5</bval.version>