fixed accidental test failures
This commit is contained in:
@@ -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.
|
||||
@@ -60,6 +60,10 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
|
||||
return beanName;
|
||||
}
|
||||
|
||||
public void setActualSpouse(TestBean spouse) {
|
||||
setSpouse(spouse);
|
||||
}
|
||||
|
||||
public void setSpouseRef(String name) {
|
||||
setSpouse(new TestBean(name));
|
||||
}
|
||||
@@ -82,4 +86,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
|
||||
return destroyed;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -200,10 +200,6 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
|
||||
this.spouses = new ITestBean[] {spouse};
|
||||
}
|
||||
|
||||
public void setActualSpouse(TestBean spouse) {
|
||||
this.spouses = new ITestBean[] {spouse};
|
||||
}
|
||||
|
||||
public ITestBean getSpouse() {
|
||||
return (spouses != null ? spouses[0] : null);
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="pDavid" class="test.beans.TestBean" scope="prototype">
|
||||
<bean id="pDavid" class="test.beans.DerivedTestBean" scope="prototype">
|
||||
<property name="name"><value>David</value></property>
|
||||
<property name="age"><value>27</value></property>
|
||||
<property name="actualSpouse" value="Jen"/>
|
||||
|
||||
Reference in New Issue
Block a user