Project: Quartz

Revision: 837

Author: jhouse

Date: 25 Aug 2008 15:17:30

• /trunk/src/test/java/org/quartz/CronExpressionTest.java

  ......	@@ -167,6 +167,11 @@
  167	167	assertTrue("Incorrect ParseException thrown",
  168	168	pe.getMessage().startsWith("Support for specifying 'L' with other days of the week is not implemented"));
  169	169	}
  	170	try {
  	171	CronExpression cronExpression = new CronExpression("0 43 9 ? * 5L");
  	172	} catch(ParseException pe) {
  	173	fail("Unexpected ParseException thrown for supported '5L' expression.");
  	174	}
  170	175	}
  171	176
  172	177	}

• /trunk/src/java/org/quartz/CronExpression.java

  ......	@@ -416,11 +416,11 @@
  416	416	String expr = exprsTok.nextToken().trim();
  417	417
  418	418	// throw an exception if L is used with other days of the month
  419		if(exprOn == DAY_OF_MONTH && expr.indexOf('L') != -1 && expr.length() > 1) {
  	419	if(exprOn == DAY_OF_MONTH && expr.indexOf('L') != -1 && expr.length() > 1 && expr.indexOf(",") >= 0) {
  420	420	throw new ParseException("Support for specifying 'L' and 'LW' with other days of the month is not implemented", -1);
  421	421	}
  422	422	// throw an exception if L is used with other days of the week
  423		if(exprOn == DAY_OF_WEEK && expr.indexOf('L') != -1 && expr.length() > 1) {
  	423	if(exprOn == DAY_OF_WEEK && expr.indexOf('L') != -1 && expr.length() > 1 && expr.indexOf(",") >= 0) {
  424	424	throw new ParseException("Support for specifying 'L' with other days of the week is not implemented", -1);
  425	425	}
  426	426