Author: ivaynberg
Date: Sat Mar 26 06:54:12 2011
New Revision: 1085656
URL: http://svn.apache.org/viewvc?rev=1085656&view=rev
Log:
Issue: WICKET-3548
Modified:
wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
Modified:
wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java?rev=1085656&r1=1085655&r2=1085656&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
Sat Mar 26 06:54:12 2011
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.proxy;
-import java.io.InvalidClassException;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.lang.reflect.InvocationHandler;
@@ -227,13 +226,16 @@ public class LazyInitProxyFactory
private Object readResolve() throws ObjectStreamException
{
- Class<?> clazz = Objects.resolveClass(type);
- if (clazz == null)
+ Class<?> clazz;
+ try
{
- throw new InvalidClassException(type, "could
not resolve class [" + type +
- "] when deserializing proxy");
+ clazz = Objects.resolveClass(type);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException("Could not resolve
class [" + type +
+ "] when deserializing proxy", e);
}
-
return LazyInitProxyFactory.createProxy(clazz, locator);
}
}
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=1085656&r1=1085655&r2=1085656&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
Sat Mar 26 06:54:12 2011
@@ -1262,33 +1262,21 @@ public final class Objects
* @param className
* Class to resolve
* @return Resolved class
+ * @throws ClassNotFoundException
*/
@SuppressWarnings("unchecked")
- public static <T> Class<T> resolveClass(final String className)
+ public static <T> Class<T> resolveClass(final String className) throws
ClassNotFoundException
{
- if (className == null)
+ if (Application.exists())
{
- return null;
- }
- try
- {
- if (Application.exists())
- {
- return (Class<T>)Application.get()
- .getApplicationSettings()
- .getClassResolver()
- .resolveClass(className);
- }
- return (Class<T>)Class.forName(className);
- }
- catch (ClassNotFoundException e)
- {
- log.warn("Could not resolve class: " + className);
- return null;
+ return (Class<T>)Application.get()
+ .getApplicationSettings()
+ .getClassResolver()
+ .resolveClass(className);
}
+ return (Class<T>)Class.forName(className);
}
-
/**
* Instantiation not allowed
*/
