You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/06/24 21:58:34 UTC

svn commit: r550280 - in /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket: markup/MarkupCache.java settings/Settings.java

Author: almaw
Date: Sun Jun 24 12:58:33 2007
New Revision: 550280

URL: http://svn.apache.org/viewvc?view=rev&rev=550280
Log:
Fix markup cache constructor so it always works, even when you're shutting down before you've had a request.

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
    incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?view=diff&rev=550280&r1=550279&r2=550280
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java Sun Jun 24 12:58:33 2007
@@ -75,9 +75,9 @@
 	 * 
 	 * @param application
 	 */
-	public MarkupCache()
+	public MarkupCache(Application application)
 	{
-		this.application = Application.get();
+		this.application = application;
 	}
 
 	/**

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java?view=diff&rev=550280&r1=550279&r2=550280
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java Sun Jun 24 12:58:33 2007
@@ -1255,7 +1255,7 @@
 		if (this.markupCache == null)
 		{
 			// Construct markup cache for this application
-			this.markupCache = new MarkupCache();
+			this.markupCache = new MarkupCache(application);
 		}
 
 		return this.markupCache;