You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/01/14 22:17:31 UTC
svn commit: r899413 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket:
application/DefaultClassResolver.java application/ReloadingClassLoader.java
protocol/http/ContextParamWebApplicationFactory.java
protocol/http/WicketFilter.java
Author: jdonnerstag
Date: Thu Jan 14 21:17:27 2010
New Revision: 899413
URL: http://svn.apache.org/viewvc?rev=899413&view=rev
Log:
fixed: FormComponent doesn't properly handle array model types
Issue: WICKET-2672
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java?rev=899413&r1=899412&r2=899413&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/application/DefaultClassResolver.java Thu Jan 14 21:17:27 2010
@@ -108,7 +108,9 @@
{
loader = DefaultClassResolver.class.getClassLoader();
}
- clazz = loader.loadClass(classname);
+ // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6500212
+ // clazz = loader.loadClass(classname);
+ clazz = Class.forName(classname, false, loader);
if (clazz == null)
{
throw new ClassNotFoundException(classname);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java?rev=899413&r1=899412&r2=899413&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java Thu Jan 14 21:17:27 2010
@@ -197,7 +197,7 @@
*/
public ReloadingClassLoader(ClassLoader parent)
{
- super(new URL[] {}, parent);
+ super(new URL[] { }, parent);
// probably doubles from this class, but just in case
addClassLoaderUrls(parent);
@@ -282,7 +282,9 @@
else
{
// Will throw a CFNE if not found in parent
- clazz = parent.loadClass(name);
+ // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6500212
+ // clazz = parent.loadClass(name);
+ clazz = Class.forName(name, false, parent);
}
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java?rev=899413&r1=899412&r2=899413&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/ContextParamWebApplicationFactory.java Thu Jan 14 21:17:27 2010
@@ -65,7 +65,10 @@
{
loader = getClass().getClassLoader();
}
- final Class<?> applicationClass = loader.loadClass(applicationClassName);
+
+ // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6500212
+ // final Class<?> applicationClass = loader.loadClass(applicationClassName);
+ final Class<?> applicationClass = Class.forName(applicationClassName, false, loader);
if (WebApplication.class.isAssignableFrom(applicationClass))
{
// Construct WebApplication subclass
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=899413&r1=899412&r2=899413&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Thu Jan 14 21:17:27 2010
@@ -228,9 +228,12 @@
try
{
// Try to find the specified factory class
- final Class<?> factoryClass = Thread.currentThread()
- .getContextClassLoader()
- .loadClass(appFactoryClassName);
+ // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6500212
+ // final Class<?> factoryClass = Thread.currentThread()
+ // .getContextClassLoader()
+ // .loadClass(appFactoryClassName);
+ final Class<?> factoryClass = Class.forName(appFactoryClassName, false,
+ Thread.currentThread().getContextClassLoader());
// Instantiate the factory
return (IWebApplicationFactory)factoryClass.newInstance();