svn commit: r987649 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket: Application.java markup/MarkupFactory.java

[iv...@apache.org]

Author: ivaynberg
Date: Fri Aug 20 22:08:17 2010
New Revision: 987649

URL: http://svn.apache.org/viewvc?rev=987649&view=rev
Log:
fixes markup cache shutdown
Issue: WICKET-3006

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
    wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=987649&r1=987648&r2=987649&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Fri Aug 20 22:08:17 2010
@@ -35,6 +35,7 @@ import org.apache.wicket.application.ICo
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.event.IEventSink;
 import org.apache.wicket.javascript.DefaultJavascriptCompressor;
+import org.apache.wicket.markup.MarkupFactory;
 import org.apache.wicket.markup.MarkupParser;
 import org.apache.wicket.markup.html.EmptySrcAttributeCheckFilter;
 import org.apache.wicket.markup.html.IHeaderContributor;
@@ -885,7 +886,10 @@ public abstract class Application implem
 		// Clear caches of Class keys so the classloader can be garbage
 		// collected (WICKET-625)
 		PropertyResolver.destroy(this);
-		getMarkupSettings().getMarkupFactory().getMarkupCache().shutdown();
+		MarkupFactory markupFactory = getMarkupSettings().getMarkupFactory();
+
+		if (markupFactory.hasMarkupCache())
+			markupFactory.getMarkupCache().shutdown();
 
 		onDestroy();
 

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java?rev=987649&r1=987648&r2=987649&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupFactory.java Fri Aug 20 22:08:17 2010
@@ -137,6 +137,16 @@ public class MarkupFactory
 	}
 
 	/**
+	 * return if markup cache has been initialized yet
+	 *
+	 * @return <code>true</code> if markup cache was already initialized, <code>false</code> otherwise
+	 */
+	public boolean hasMarkupCache()
+	{
+		return markupCache != null;
+	}
+
+	/**
 	 * Gets a fresh markup stream that contains the (immutable) markup resource for this class.
 	 * 
 	 * @param container