Author: jdonnerstag
Date: Sat Mar 7 08:30:31 2009
New Revision: 751222
URL: http://svn.apache.org/viewvc?rev=751222&view=rev
Log:
fixed WICKET-2135 PackagedTextTemplate uses default ResourceStreamLocator first
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?rev=751222&r1=751221&r2=751222&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
Sat Mar 7 08:30:31 2009
@@ -153,14 +153,13 @@
// TODO implement cache
// first try default class loading locator to find the resource
- IResourceStream stream = new
ResourceStreamLocator().locate(clazz, path);
+ IResourceStream stream =
app.getResourceSettings().getResourceStreamLocator().locate(clazz,
+ path);
if (stream == null)
{
- // if default locator couldnt find the resource allow
the application specific one to
- // try
- stream =
Application.get().getResourceSettings().getResourceStreamLocator().locate(
- clazz, path);
+ // if default locator couldnt find the resource, than
some fallback
+ stream = new ResourceStreamLocator().locate(clazz,
path);
}
if (stream == null)
