Author: brett Date: Fri Jul 21 06:48:28 2006 New Revision: 424318 URL: http://svn.apache.org/viewvc?rev=424318&view=rev Log: fix bug in initial startup
Modified: maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java Modified: maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java URL: http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java?rev=424318&r1=424317&r2=424318&view=diff ============================================================================== --- maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java (original) +++ maven/repository-manager/trunk/maven-repository-core/src/main/java/org/apache/maven/repository/scheduler/DefaultRepositoryTaskScheduler.java Fri Jul 21 06:48:28 2006 @@ -96,24 +96,31 @@ private void scheduleJobs( Configuration configuration ) throws ParseException, SchedulerException { - JobDetail jobDetail = new JobDetail( INDEXER_JOB, DISCOVERER_GROUP, RepositoryTaskJob.class ); - JobDataMap dataMap = new JobDataMap(); - dataMap.put( AbstractJob.LOGGER, getLogger() ); - dataMap.put( RepositoryTaskJob.TASK_KEY, indexerTask ); - jobDetail.setJobDataMap( dataMap ); - - getLogger().info( "Scheduling indexer: " + configuration.getIndexerCronExpression() ); - CronTrigger trigger = - new CronTrigger( INDEXER_JOB + "Trigger", DISCOVERER_GROUP, configuration.getIndexerCronExpression() ); - scheduler.scheduleJob( jobDetail, trigger ); - - try + if ( configuration.getIndexPath() != null ) { - indexerTask.executeNowIfNeeded(); + JobDetail jobDetail = new JobDetail( INDEXER_JOB, DISCOVERER_GROUP, RepositoryTaskJob.class ); + JobDataMap dataMap = new JobDataMap(); + dataMap.put( AbstractJob.LOGGER, getLogger() ); + dataMap.put( RepositoryTaskJob.TASK_KEY, indexerTask ); + jobDetail.setJobDataMap( dataMap ); + + getLogger().info( "Scheduling indexer: " + configuration.getIndexerCronExpression() ); + CronTrigger trigger = + new CronTrigger( INDEXER_JOB + "Trigger", DISCOVERER_GROUP, configuration.getIndexerCronExpression() ); + scheduler.scheduleJob( jobDetail, trigger ); + + try + { + indexerTask.executeNowIfNeeded(); + } + catch ( TaskExecutionException e ) + { + getLogger().error( "Error executing task first time, continuing anyway: " + e.getMessage(), e ); + } } - catch ( TaskExecutionException e ) + else { - getLogger().error( "Error executing task first time, continuing anyway: " + e.getMessage(), e ); + getLogger().info( "Not scheduling indexer - index path is not configured" ); } // TODO: wire in the converter @@ -159,6 +166,5 @@ throws TaskExecutionException { indexerTask.execute(); - } }