[MRM-331]: Finding an Artifact gives an HTTP 500

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@541744 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 0 deletions

diff --git a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
index 083e9b07d..8d0e5690d 100644
--- a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
+++ b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
@@ -176,6 +176,15 @@ public class DefaultArchivaTaskScheduler
         dataMap.put( DatabaseTaskJob.TASK_QUEUE, databaseUpdateQueue );
         databaseJob.setJobDataMap( dataMap );
 
+        CronExpressionValidator cronValidator = new CronExpressionValidator();
+        if ( !cronValidator.validate( cronString ) )
+        {
+            getLogger().warn(
+                              "Cron expression [" + cronString
+                                  + "] for database update is invalid.  Defaulting to hourly." );
+            cronString = CRON_HOURLY;
+        }
+
         try
         {
             CronTrigger trigger = new CronTrigger( DATABASE_JOB_TRIGGER, DATABASE_SCAN_GROUP, cronString );