diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java index 45b0aa97638..da02b01b27b 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerFactoryBean.java @@ -256,7 +256,7 @@ public class CronTriggerFactoryBean implements FactoryBean, BeanNam this.cronTrigger = cti; */ - Class cronTriggerClass; + Class cronTriggerClass; Method jobKeyMethod; try { cronTriggerClass = getClass().getClassLoader().loadClass("org.quartz.impl.triggers.CronTriggerImpl"); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java index ae53d84018d..8f5e2d00f32 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java @@ -35,7 +35,6 @@ public class GroovyAspectTests { @Test public void testManualGroovyBeanWithUnconditionalPointcut() throws Exception { - LogUserAdvice logAdvice = new LogUserAdvice(); GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv"); @@ -43,7 +42,6 @@ public class GroovyAspectTests { new ClassPathResource("GroovyServiceImpl.grv", getClass()))); testAdvice(new DefaultPointcutAdvisor(logAdvice), logAdvice, target, "GroovyServiceImpl"); - } @Test @@ -61,7 +59,6 @@ public class GroovyAspectTests { @Test public void testManualGroovyBeanWithDynamicPointcut() throws Exception { - LogUserAdvice logAdvice = new LogUserAdvice(); GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv"); @@ -76,7 +73,6 @@ public class GroovyAspectTests { @Test public void testManualGroovyBeanWithDynamicPointcutProxyTargetClass() throws Exception { - LogUserAdvice logAdvice = new LogUserAdvice(); GroovyScriptFactory scriptFactory = new GroovyScriptFactory("GroovyServiceImpl.grv"); @@ -91,6 +87,7 @@ public class GroovyAspectTests { private void testAdvice(Advisor advisor, LogUserAdvice logAdvice, TestService target, String message) throws Exception { + testAdvice(advisor, logAdvice, target, message, false); }