BeanFactory accepts getBean arguments for non-prototype beans as well

Issue: SPR-12488

Author: jhoeller

spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java

@@ -24,7 +24,6 @@
 import org.junit.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.tests.sample.beans.TestBean;
@@ -325,32 +324,32 @@ public void testCanSpecifyFactoryMethodArgumentsOnFactoryMethodPrototype() {
 	}
 
 	@Test
-	public void testCannotSpecifyFactoryMethodArgumentsOnSingleton() {
+	public void testCanSpecifyFactoryMethodArgumentsOnSingleton() {
 		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
 		reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
-		try {
-			xbf.getBean("testBeanOnly", new TestBean());
-			fail("Shouldn't allow args to be passed to a singleton");
-		}
-		catch (BeanDefinitionStoreException ex) {
-			// OK
-		}
+
+		// First getBean call triggers actual creation of the singleton bean
+		TestBean tb = new TestBean();
+		FactoryMethods fm1 = (FactoryMethods) xbf.getBean("testBeanOnly", tb);
+		assertSame(tb, fm1.getTestBean());
+		FactoryMethods fm2 = (FactoryMethods) xbf.getBean("testBeanOnly", new TestBean());
+		assertSame(fm1, fm2);
+		assertSame(tb, fm2.getTestBean());
 	}
 
 	@Test
 	public void testCannotSpecifyFactoryMethodArgumentsOnSingletonAfterCreation() {
 		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(xbf);
 		reader.loadBeanDefinitions(new ClassPathResource("factory-methods.xml", getClass()));
-		xbf.getBean("testBeanOnly");
-		try {
-			xbf.getBean("testBeanOnly", new TestBean());
-			fail("Shouldn't allow args to be passed to a singleton");
-		}
-		catch (BeanDefinitionStoreException ex) {
-			// OK
-		}
+
+		// First getBean call triggers actual creation of the singleton bean
+		FactoryMethods fm1 = (FactoryMethods) xbf.getBean("testBeanOnly");
+		TestBean tb = fm1.getTestBean();
+		FactoryMethods fm2 = (FactoryMethods) xbf.getBean("testBeanOnly", new TestBean());
+		assertSame(fm1, fm2);
+		assertSame(tb, fm2.getTestBean());
 	}
 
 	@Test
@@ -386,7 +385,6 @@ public void testFactoryMethodForJavaMailSession() {
 		assertEquals("someuser", session.getProperty("mail.smtp.user"));
 		assertEquals("somepw", session.getProperty("mail.smtp.password"));
 	}
-
 }