Browse Source

polishing

pull/23217/head
Juergen Hoeller 17 years ago
parent
commit
82fd947712
  1. 6
      org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java
  2. 3
      org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java

6
org.springframework.beans/src/main/java/org/springframework/beans/BeanUtils.java

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -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;
}

3
org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java

@ -65,7 +65,8 @@ public class ClassPathBeanDefinitionScanner extends ClassPathScanningCandidateCo @@ -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,

Loading…
Cancel
Save