Author: almaw
Date: Mon Jun 18 03:30:30 2007
New Revision: 548285
URL: http://svn.apache.org/viewvc?view=rev&rev=548285
Log:
WICKET-625 - Wicket doesn't clean up properly when hot-deploying; hangs onto
Class references. (partial fix, work in progress)
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?view=diff&rev=548285&r1=548284&r2=548285
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
Mon Jun 18 03:30:30 2007
@@ -20,6 +20,7 @@
import java.io.InputStream;
import java.util.Locale;
+import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.time.Time;
@@ -48,7 +49,7 @@
* The actual component class the markup is directly associated with. It
* might be super class of the component class
*/
- private final Class markupClass;
+ private final String markupClassName;
/** The key used to cache the markup resource stream */
private String cacheKey;
@@ -62,7 +63,7 @@
{
this.resourceStream = resourceStream;
this.containerInfo = null;
- this.markupClass = null;
+ this.markupClassName = null;
if (resourceStream == null)
{
@@ -82,7 +83,7 @@
{
this.resourceStream = resourceStream;
this.containerInfo = containerInfo;
- this.markupClass = markupClass;
+ this.markupClassName = markupClass == null ? null :
markupClass.getName();
if (resourceStream == null)
{
@@ -161,7 +162,7 @@
*/
public Class getMarkupClass()
{
- return markupClass;
+ return Classes.resolveClass(markupClassName);
}
/**
