You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/04/06 20:16:46 UTC
svn commit: r1089556 -
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
Author: mgrigorov
Date: Wed Apr 6 18:16:46 2011
New Revision: 1089556
URL: http://svn.apache.org/viewvc?rev=1089556&view=rev
Log:
WICKET-3600 org/apache/wicket/util/lang/WicketObjects resolveClass resolved not used
Resolve the class with the current class loader only if it is still not found by the registered IClassResolver.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java?rev=1089556&r1=1089555&r2=1089556&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/lang/WicketObjects.java Wed Apr 6 18:16:46 2011
@@ -74,8 +74,12 @@ public class WicketObjects
.getClassResolver()
.resolveClass(className);
}
- resolved = (Class<T>)Class.forName(className, false, Thread.currentThread()
- .getContextClassLoader());
+
+ if (resolved == null)
+ {
+ resolved = (Class<T>)Class.forName(className, false, Thread.currentThread()
+ .getContextClassLoader());
+ }
}
catch (ClassNotFoundException cnfx)
{