You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/05/03 18:08:56 UTC

svn commit: r534921 - /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/TemplateSourceImpl.java

Author: jkuhnert
Date: Thu May  3 09:08:55 2007
New Revision: 534921

URL: http://svn.apache.org/viewvc?view=rev&rev=534921
Log:
Fixes TAPESTRY-1396. Missing leading "/" in template context path resolution.

Modified:
    tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/TemplateSourceImpl.java

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/TemplateSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/TemplateSourceImpl.java?view=diff&rev=534921&r1=534920&r2=534921
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/TemplateSourceImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/TemplateSourceImpl.java Thu May  3 09:08:55 2007
@@ -294,9 +294,9 @@
             templateName =  templateName + "." + templateExtension;
             Resource context = component.getNamespace().getSpecificationLocation();
             
-            if (_contextAssetFactory.assetExists(component.getSpecification(), context, templateName, locale)) {
+            if (_contextAssetFactory.assetExists(component.getSpecification(), context, "/" + templateName, locale)) {
 
-                return _classpathAssetFactory.createAsset(context, component.getSpecification(), templateName, locale, component.getLocation());
+                return _classpathAssetFactory.createAsset(context, component.getSpecification(), "/" + templateName, locale, component.getLocation());
             } else if (_contextAssetFactory.assetExists(component.getSpecification(), context, WEB_INF + templateName, locale)) {
 
                 return _classpathAssetFactory.createAsset(context, component.getSpecification(), WEB_INF + templateName, locale, component.getLocation());