root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

improved NoClassDefFoundError handling during constructor resolution (SPR-5522)

This commit is contained in:
Juergen Hoeller 2009-02-25 10:07:57 +00:00
parent b80362f8d1
commit 092de0107c
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -102,7 +102,7 @@ class ConstructorResolver {
* or <code>null</code> if none (-> use constructor argument values from bean definition) * or <code>null</code> if none (-> use constructor argument values from bean definition)
* @return a BeanWrapper for the new instance * @return a BeanWrapper for the new instance
*/ */
protected BeanWrapper autowireConstructor( public BeanWrapper autowireConstructor(
String beanName, RootBeanDefinition mbd, Constructor[] chosenCtors, Object[] explicitArgs) { String beanName, RootBeanDefinition mbd, Constructor[] chosenCtors, Object[] explicitArgs) {
BeanWrapperImpl bw = new BeanWrapperImpl(); BeanWrapperImpl bw = new BeanWrapperImpl();
@ -148,7 +148,7 @@ class ConstructorResolver {
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR); mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
ConstructorArgumentValues resolvedValues = null; ConstructorArgumentValues resolvedValues = null;
int minNrOfArgs = 0; int minNrOfArgs;
if (explicitArgs != null) { if (explicitArgs != null) {
minNrOfArgs = explicitArgs.length; minNrOfArgs = explicitArgs.length;
} }
@ -159,8 +159,18 @@ class ConstructorResolver {
} }
// Take specified constructors, if any. // Take specified constructors, if any.
Constructor[] candidates = Constructor[] candidates = chosenCtors;
(chosenCtors != null ? chosenCtors : mbd.getBeanClass().getDeclaredConstructors()); if (candidates == null) {
Class beanClass = mbd.getBeanClass();
try {
candidates = beanClass.getDeclaredConstructors();
}
catch (Throwable ex) {
throw new BeanCreationException(mbd.getResourceDescription(), beanName,
"Resolution of declared constructors on bean Class [" + beanClass.getName() +
"] from ClassLoader [" + beanClass.getClassLoader() + "] failed", ex);
}
}
AutowireUtils.sortConstructors(candidates); AutowireUtils.sortConstructors(candidates);
int minTypeDiffWeight = Integer.MAX_VALUE; int minTypeDiffWeight = Integer.MAX_VALUE;
@ -180,7 +190,7 @@ class ConstructorResolver {
"(hint: specify index and/or type arguments for simple parameters to avoid type ambiguities)"); "(hint: specify index and/or type arguments for simple parameters to avoid type ambiguities)");
} }
ArgumentsHolder args = null; ArgumentsHolder args;
List<Exception> causes = null; List<Exception> causes = null;
if (resolvedValues != null) { if (resolvedValues != null) {
@ -270,9 +280,9 @@ class ConstructorResolver {
BeanWrapperImpl bw = new BeanWrapperImpl(); BeanWrapperImpl bw = new BeanWrapperImpl();
this.beanFactory.initBeanWrapper(bw); this.beanFactory.initBeanWrapper(bw);
Class factoryClass = null; Object factoryBean;
Object factoryBean = null; Class factoryClass;
boolean isStatic = true; boolean isStatic;
String factoryBeanName = mbd.getFactoryBeanName(); String factoryBeanName = mbd.getFactoryBeanName();
if (factoryBeanName != null) { if (factoryBeanName != null) {
@ -290,7 +300,9 @@ class ConstructorResolver {
} }
else { else {
// It's a static factory method on the bean class. // It's a static factory method on the bean class.
factoryBean = null;
factoryClass = mbd.getBeanClass(); factoryClass = mbd.getBeanClass();
isStatic = true;
} }
Method factoryMethodToUse = null; Method factoryMethodToUse = null;
@ -335,7 +347,7 @@ class ConstructorResolver {
int minTypeDiffWeight = Integer.MAX_VALUE; int minTypeDiffWeight = Integer.MAX_VALUE;
ConstructorArgumentValues resolvedValues = null; ConstructorArgumentValues resolvedValues = null;
int minNrOfArgs = 0; int minNrOfArgs;
if (explicitArgs != null) { if (explicitArgs != null) {
minNrOfArgs = explicitArgs.length; minNrOfArgs = explicitArgs.length;
} }
@ -357,7 +369,7 @@ class ConstructorResolver {
candidate.getName().equals(mbd.getFactoryMethodName()) && candidate.getName().equals(mbd.getFactoryMethodName()) &&
paramTypes.length >= minNrOfArgs) { paramTypes.length >= minNrOfArgs) {
ArgumentsHolder args = null; ArgumentsHolder args;
if (resolvedValues != null) { if (resolvedValues != null) {
// Resolved contructor arguments: type conversion and/or autowiring necessary. // Resolved contructor arguments: type conversion and/or autowiring necessary.