You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/04/15 18:59:24 UTC
svn commit: r1739333 - in
/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs:
JobBuilderImpl.java scheduling/JobSchedulerImpl.java
scheduling/ScheduledJobInfoImpl.java
Author: cziegeler
Date: Fri Apr 15 16:59:24 2016
New Revision: 1739333
URL: http://svn.apache.org/viewvc?rev=1739333&view=rev
Log:
SLING-5666 : Unscheduling a job should remove corresponding node
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobBuilderImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/ScheduledJobInfoImpl.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobBuilderImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobBuilderImpl.java?rev=1739333&r1=1739332&r2=1739333&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobBuilderImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobBuilderImpl.java Fri Apr 15 16:59:24 2016
@@ -67,12 +67,4 @@ public class JobBuilderImpl implements J
UUID.randomUUID().toString(),
this.jobManager.getJobScheduler());
}
-
- public ScheduleBuilder schedule(final String name) {
- return new JobScheduleBuilderImpl(
- this.topic,
- this.properties,
- name,
- this.jobManager.getJobScheduler());
- }
}
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java?rev=1739333&r1=1739332&r2=1739333&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/JobSchedulerImpl.java Fri Apr 15 16:59:24 2016
@@ -191,7 +191,7 @@ public class JobSchedulerImpl
}
/**
- * Remove a scheduled job
+ * Unschedule a scheduled job
*/
public void unscheduleJob(final ScheduledJobInfoImpl info) {
synchronized ( this.scheduledJobs ) {
@@ -202,6 +202,13 @@ public class JobSchedulerImpl
}
/**
+ * Remove a scheduled job
+ */
+ public void removeJob(final ScheduledJobInfoImpl info) {
+ this.scheduledJobHandler.remove(info);
+ }
+
+ /**
* Start a scheduled job
* @param info The scheduling info
*/
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/ScheduledJobInfoImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/ScheduledJobInfoImpl.java?rev=1739333&r1=1739332&r2=1739333&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/ScheduledJobInfoImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/scheduling/ScheduledJobInfoImpl.java Fri Apr 15 16:59:24 2016
@@ -145,7 +145,7 @@ public class ScheduledJobInfoImpl implem
*/
@Override
public void unschedule() {
- this.jobScheduler.unscheduleJob(this);
+ this.jobScheduler.removeJob(this);
}
/**