you should create a jira for this so it shows up in the changelog.... -igor
On Tue, Mar 18, 2008 at 10:50 AM, <[EMAIL PROTECTED]> wrote: > Author: jcompagner > Date: Tue Mar 18 10:50:14 2008 > New Revision: 638471 > > URL: http://svn.apache.org/viewvc?rev=638471&view=rev > Log: > cachekey = null support was broken by the new implementation > > Modified: > > wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java > > Modified: > wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java > URL: > http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?rev=638471&r1=638470&r2=638471&view=diff > > ============================================================================== > --- > wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java > (original) > +++ > wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java > Tue Mar 18 10:50:14 2008 > @@ -433,8 +433,11 @@ > Markup markup = > getMarkupLoader().loadMarkup(container, markupResourceStream, null, > enforceReload); > > - // add the markup to the cache. > - markupKeyCache.put(cacheKey, locationString); > + if (cacheKey != null) > + { > + // add the markup to the cache. > + markupKeyCache.put(cacheKey, locationString); > + } > return putIntoCache(locationString, markup); > } > catch (ResourceStreamNotFoundException e) > @@ -473,22 +476,22 @@ > final MarkupResourceStream markupResourceStream, final > boolean enforceReload) > { > final String cacheKey = markupResourceStream.getCacheKey(); > - // get the location String > - String locationString = > markupResourceStream.locationAsString(); > - if (locationString == null) > - { > - // set the cache key as location string, because > location string > - // couldn't be resolved. > - locationString = cacheKey; > - } > - Markup markup = (Markup)markupCache.get(locationString); > - if (markup != null) > - { > - markupKeyCache.put(cacheKey, locationString); > - return markup; > - } > if (cacheKey != null) > { > + // get the location String > + String locationString = > markupResourceStream.locationAsString(); > + if (locationString == null) > + { > + // set the cache key as location string, > because location string > + // couldn't be resolved. > + locationString = cacheKey; > + } > + Markup markup = > (Markup)markupCache.get(locationString); > + if (markup != null) > + { > + markupKeyCache.put(cacheKey, locationString); > + return markup; > + } > // Watch file in the future > final ModificationWatcher watcher = Application.get() > .getResourceSettings() > > >
