diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 2b18aa3d2fe901061a9b7b816ba77bb13794a615..fbf5dc9f0f5f5d6f2a8b8d865e3a89ae68f8448c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -759,7 +759,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac } } }); - if (objectType.value != null) { + if (objectType.value != null && !Object.class.equals(objectType.value)) { return objectType.value; } } diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java new file mode 100644 index 0000000000000000000000000000000000000000..c4a93ce17e058209fb3ab9af623c1c57e5e29d4e --- /dev/null +++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerFactoryBeanIntegrationTests.java @@ -0,0 +1,70 @@ +/* + * Copyright 2002-2014 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.remoting.httpinvoker; + +import org.junit.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +import static org.junit.Assert.*; + +/** + * + * @author Stephane Nicoll + */ +public class HttpInvokerFactoryBeanIntegrationTests { + + @Test + public void foo() { + ApplicationContext context = new AnnotationConfigApplicationContext(InvokerAutowiringConfig.class); + MyBean myBean = context.getBean(MyBean.class); + assertSame(context.getBean("myService"), myBean.myService); + } + + + public interface MyService { + } + + + @Component + public static class MyBean { + + @Autowired + private MyService myService; + } + + + @Configuration + @ComponentScan + public static class InvokerAutowiringConfig { + + @Bean + public HttpInvokerProxyFactoryBean myService() { + HttpInvokerProxyFactoryBean factory = new HttpInvokerProxyFactoryBean(); + factory.setServiceUrl("/svc/dummy"); + factory.setServiceInterface(MyService.class); + return factory; + } + } + +}