diff --git a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java index a4e624ec815..6e29ad4f102 100644 --- a/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java +++ b/org.springframework.context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java @@ -50,6 +50,7 @@ public class ScheduledTasksBeanDefinitionParser extends AbstractSingleBeanDefini @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { + builder.setLazyInit(false); // lazy scheduled tasks are a contradiction in terms -> force to false ManagedMap cronTaskMap = new ManagedMap(); ManagedMap fixedDelayTaskMap = new ManagedMap(); ManagedMap fixedRateTaskMap = new ManagedMap(); diff --git a/org.springframework.context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java b/org.springframework.context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java new file mode 100644 index 00000000000..b1a2383296b --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/scheduling/config/LazyScheduledTasksBeanDefinitionParserTests.java @@ -0,0 +1,54 @@ +/* + * Copyright 2002-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.scheduling.config; + +import org.junit.Test; +import org.springframework.context.support.GenericXmlApplicationContext; + +/** + * Tests ensuring that tasks scheduled using the element + * are never marked lazy, even if the enclosing element declares + * default-lazy-init="true". See SPR-8498 + * + * @author Mike Youngstrom + * @author Chris Beams + */ +public class LazyScheduledTasksBeanDefinitionParserTests { + + @Test(timeout = 5000) + public void checkTarget() { + Task task = + new GenericXmlApplicationContext( + LazyScheduledTasksBeanDefinitionParserTests.class, + "lazyScheduledTasksContext.xml") + .getBean(Task.class); + + while (!task.executed) { + try { + Thread.sleep(10); + } catch (Exception e) { /* Do Nothing */ } + } + } + + static class Task { + volatile boolean executed = false; + + public void doWork() { + executed = true; + } + } +} diff --git a/org.springframework.context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml b/org.springframework.context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml new file mode 100644 index 00000000000..d54ba358b5a --- /dev/null +++ b/org.springframework.context/src/test/resources/org/springframework/scheduling/config/lazyScheduledTasksContext.xml @@ -0,0 +1,15 @@ + + + + + + + + +