diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java index 116d487dc72..e13ae5fdbe5 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 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. @@ -210,7 +210,7 @@ public abstract class BeanUtils { Method targetMethod = doFindMethodWithMinimalParameters(clazz.getDeclaredMethods(), methodName); if (targetMethod == null) { - return findDeclaredMethodWithMinimalParameters(clazz, methodName); + targetMethod = findDeclaredMethodWithMinimalParameters(clazz, methodName); } return targetMethod; } @@ -232,7 +232,7 @@ public abstract class BeanUtils { Method targetMethod = doFindMethodWithMinimalParameters(clazz.getDeclaredMethods(), methodName); if (targetMethod == null && clazz.getSuperclass() != null) { - return findDeclaredMethodWithMinimalParameters(clazz.getSuperclass(), methodName); + targetMethod = findDeclaredMethodWithMinimalParameters(clazz.getSuperclass(), methodName); } return targetMethod; } diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java index 13093718310..1e65f464a7a 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java @@ -65,7 +65,8 @@ public class ClassPathBeanDefinitionScanner extends ClassPathScanningCandidateCo private ScopeMetadataResolver scopeMetadataResolver = new AnnotationScopeMetadataResolver(); private boolean includeAnnotationConfig = true; - + + /** * Create a new ClassPathBeanDefinitionScanner for the given bean factory. * @param registry the BeanFactory to load bean definitions into,