Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/31e00415 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/31e00415 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/31e00415 Branch: refs/heads/develop Commit: 31e004150e7da1b6c0737a862cd0b6f09f37234f Parents: 725b616 52d69b6 Author: Niclas Hedhman <[email protected]> Authored: Sun Nov 29 14:04:13 2015 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Sun Nov 29 14:04:13 2015 +0800 ---------------------------------------------------------------------- .../apache/zest/api/unitofwork/UnitOfWork.java | 18 +++-- .../runtime/composite/ConstructorsModel.java | 31 +++------ .../injection/InjectedParametersModel.java | 16 ----- .../ConstructorInjectionOfThisTest.java | 72 +++++++++++++++++--- .../zest/runtime/mixin/PrivateMixinTest.java | 38 +++++++++-- .../org/apache/zest/spi/module/ModuleSpi.java | 5 -- libraries/restlet/build.gradle | 2 +- .../zest/library/scheduler/CronSchedule.java | 3 +- .../zest/library/scheduler/ScheduleFactory.java | 2 - .../library/scheduler/defaults/package.html | 21 ++++++ .../library/scheduler/internal/Execution.java | 5 +- .../scheduler/internal/ScheduleTime.java | 4 +- .../scheduler/internal/SchedulerMixin.java | 2 +- .../library/scheduler/internal/package.html | 21 ++++++ .../library/scheduler/CronScheduleTest.java | 19 ++---- 15 files changed, 171 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/31e00415/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java ---------------------------------------------------------------------- diff --cc libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java index 08eb627,7eb53ea..1925ac6 --- a/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java +++ b/libraries/scheduler/src/main/java/org/apache/zest/library/scheduler/internal/Execution.java @@@ -168,10 -171,10 +168,10 @@@ public interface Executio { submitTaskForExecution( oldScheduleTime ); Schedule schedule = uow.get( Schedule.class, oldScheduleTime.scheduleIdentity() ); - long nextTime = schedule.nextRun( now + 1000 ); + long nextTime = schedule.nextRun( now ); if( nextTime != Long.MIN_VALUE ) { - ScheduleTime newScheduleTime = new ScheduleTime( schedule.identity().get(), nextTime ); + ScheduleTime newScheduleTime = new ScheduleTime( oldScheduleTime.scheduleIdentity(), nextTime ); synchronized( lock ) { // Re-add to the Timing Queue, to re-position the sorting.
