diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java b/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java index 5e3bfb6004b..605b29d3a07 100644 --- a/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java +++ b/org.springframework.aop/src/main/java/org/springframework/aop/target/AbstractPrototypeBasedTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2009 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. @@ -26,8 +26,8 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory; * Base class for dynamic TargetSources that can create new prototype bean * instances to support a pooling or new-instance-per-invocation strategy. * - *

Such TargetSources must run in a BeanFactory, as it needs to call the - * getBean method to create a new prototype instance. + *

Such TargetSources must run in a {@link BeanFactory}, as it needs to + * call the getBean method to create a new prototype instance. * Therefore, this base class extends {@link AbstractBeanFactoryBasedTargetSource}. * * @author Rod Johnson @@ -56,8 +56,8 @@ public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFac * @throws BeansException if bean creation failed */ protected Object newPrototypeInstance() throws BeansException { - if (this.logger.isDebugEnabled()) { - this.logger.debug("Creating new instance of bean '" + getTargetBeanName() + "'"); + if (logger.isDebugEnabled()) { + logger.debug("Creating new instance of bean '" + getTargetBeanName() + "'"); } return getBeanFactory().getBean(getTargetBeanName()); } @@ -78,7 +78,7 @@ public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFac ((DisposableBean) target).destroy(); } catch (Throwable ex) { - this.logger.error("Couldn't invoke destroy method of bean with name '" + getTargetBeanName() + "'", ex); + logger.error("Couldn't invoke destroy method of bean with name '" + getTargetBeanName() + "'", ex); } } } diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java index 23a86994427..9aaa94ca236 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java +++ b/org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java @@ -385,7 +385,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol if (equinoxResolveMethod != null) { URL url = original.getURL(); if (url.getProtocol().startsWith("bundle")) { - return new UrlResource((URL) ReflectionUtils.invokeMethod(equinoxResolveMethod, null, new Object[] {url})); + return new UrlResource((URL) ReflectionUtils.invokeMethod(equinoxResolveMethod, null, url)); } } return original;