AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

We always want to try the default site bundle.

Browse Source 
git-svn-id: https://samskivert.googlecode.com/svn/trunk@1768 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2006-01-21 21:36:06 +00:00
parent 1cded0f96c
commit ae49badf90
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/samskivert/src/java/com/samskivert/velocity/SiteResourceManager.java
+8 -14
View File
@@ -93,22 +93,16 @@ public class SiteResourceManager extends ResourceManagerImpl
resource.setRuntimeServices(rsvc);
resource.setEncoding(encoding);
// if the resource was requested using a site resource key, we can
// attempt to load a site-specific version; also make sure the site
// we're loading for is not the default site, in which case we want to
// skip to the second resource loader directly
if (skey.siteId != -1 && skey.siteId != SiteIdentifier.DEFAULT_SITE_ID) {
// try loading it via the site-specific resource loader
try {
resource.setName(resourceName);
resolveResource(resource, _siteLoader);
} catch (ResourceNotFoundException rnfe) {
// nothing to worry about here
}
// first try loading it via the site-specific resource loader
try {
resource.setName(resourceName);
resolveResource(resource, _siteLoader);
} catch (ResourceNotFoundException rnfe) {
// nothing to worry about here
}
// try the servlet context loader if we didn't find a site-specific
// resource
// then try the servlet context loader if we didn't find a
// site-specific resource
if (resource.getData() == null) {
resource.setName(skey.path);
resolveResource(resource, _contextLoader);