You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/03/05 19:56:42 UTC

svn commit: r1078328 - /wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java

Author: ivaynberg
Date: Sat Mar  5 18:56:41 2011
New Revision: 1078328

URL: http://svn.apache.org/viewvc?rev=1078328&view=rev
Log:
WICKET-3503

Modified:
    wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java

Modified: wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java?rev=1078328&r1=1078327&r2=1078328&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java (original)
+++ wicket/trunk/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java Sat Mar  5 18:56:41 2011
@@ -34,6 +34,7 @@ import net.sf.cglib.proxy.MethodProxy;
 
 import org.apache.wicket.IClusterable;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.lang.WicketObjects;
 
 /**
  * A factory class that creates lazy init proxies given a type and a {@link IProxyTargetLocator}
@@ -228,16 +229,12 @@ public class LazyInitProxyFactory
 		private Object readResolve() throws ObjectStreamException
 		{
 			Class<?> clazz;
-			try
-			{
-				clazz = Class.forName(type);
-			}
-			catch (ClassNotFoundException e)
+			clazz = WicketObjects.resolveClass(type);
+			if (clazz == null)
 			{
 				throw new InvalidClassException(type, "could not resolve class [" + type +
 					"] when deserializing proxy");
 			}
-
 			return LazyInitProxyFactory.createProxy(clazz, locator);
 		}
 	}