From ced2e4591615c56d072ff388b5451ce39918715b Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Mon, 11 Jun 2012 14:56:26 +0000 Subject: [PATCH] [MRM-1632] Invalid Cron in a job means webapp will not start If syntax is invalid, log a warning instead of throwing the exception, and the job will not be scheduled. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1348883 13f79535-47bb-0310-9956-ffa450edef68 --- .../DefaultDownloadRemoteIndexScheduler.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java index 1530e67c2..c9184fbc5 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java @@ -190,9 +190,17 @@ public class DefaultDownloadRemoteIndexScheduler { log.info( "schedule download remote index for repository {} with cron expression {}", remoteRepository.getId(), remoteRepository.getCronExpression() ); - taskScheduler.schedule( - new DownloadRemoteIndexTask( downloadRemoteIndexTaskRequest, this.runningRemoteDownloadIds ), - new CronTrigger( remoteRepository.getCronExpression() ) ); + try + { + CronTrigger cronTrigger = new CronTrigger( remoteRepository.getCronExpression() ); + taskScheduler.schedule( + new DownloadRemoteIndexTask( downloadRemoteIndexTaskRequest, this.runningRemoteDownloadIds ), + cronTrigger ); + } + catch ( IllegalArgumentException e ) + { + log.warn( "Unable to schedule remote index download: " + e.getLocalizedMessage() ); + } if ( remoteRepository.isDownloadRemoteIndexOnStartup() ) { -- 2.39.5