Avoid FactoryBean initialization on isSingleton check for decorated bean definition

Issue: SPR-14892
Issue: SPR-15042

spring-context/src/test/java/org/springframework/context/annotation/Spr15042Tests.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2002-2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.context.annotation;
+
+import org.junit.Test;
+
+import org.springframework.aop.framework.ProxyFactoryBean;
+import org.springframework.aop.target.CommonsPool2TargetSource;
+
+/**
+ * @author Juergen Hoeller
+ */
+public class Spr15042Tests {
+
+	@Test
+	public void poolingTargetSource() {
+		new AnnotationConfigApplicationContext(PoolingTargetSourceConfig.class);
+	}
+
+
+	@Configuration
+	static class PoolingTargetSourceConfig {
+
+		@Bean
+		@Scope(value = "request", proxyMode = ScopedProxyMode.TARGET_CLASS)
+		public ProxyFactoryBean myObject() {
+			ProxyFactoryBean pfb = new ProxyFactoryBean();
+			pfb.setTargetSource(poolTargetSource());
+			return pfb;
+		}
+
+		@Bean
+		public CommonsPool2TargetSource poolTargetSource() {
+			CommonsPool2TargetSource pool = new CommonsPool2TargetSource();
+			pool.setMaxSize(3);
+			pool.setTargetBeanName("myObjectTarget");
+			return pool;
+		}
+
+		@Bean(name = "myObjectTarget")
+		@Scope(scopeName = "prototype")
+		public Object myObjectTarget() {
+			return new Object();
+		}
+	}
+
+}