fixed registerResolvableDependency mechanism to correctly handle non-serializable factory objects (SPR-7264)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3383 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -136,11 +136,15 @@ abstract class AutowireUtils {
 	 * @return the resolved value
 	 */
 	public static Object resolveAutowiringValue(Object autowiringValue, Class requiredType) {
-		if (autowiringValue instanceof ObjectFactory && !requiredType.isInstance(autowiringValue) &&
+		if (autowiringValue instanceof ObjectFactory && !requiredType.isInstance(autowiringValue)) {
-				autowiringValue instanceof Serializable && requiredType.isInterface()) {
+			ObjectFactory factory = (ObjectFactory) autowiringValue;
-			autowiringValue = Proxy.newProxyInstance(
+			if (autowiringValue instanceof Serializable && requiredType.isInterface()) {
-					requiredType.getClassLoader(), new Class[] {requiredType},
+				autowiringValue = Proxy.newProxyInstance(requiredType.getClassLoader(),
-					new ObjectFactoryDelegatingInvocationHandler((ObjectFactory) autowiringValue));
+						new Class[] {requiredType}, new ObjectFactoryDelegatingInvocationHandler(factory));
+			}
+			else {
+				return factory.getObject();
+			}
 		}
 		return autowiringValue;
 	}