We always want to try the default site bundle.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1768 6335cc39-0255-0410-8fd6-9bcaacd3b74c

projects/samskivert/src/java/com/samskivert/velocity/SiteResourceManager.java

@@ -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
+        // first try loading it via the site-specific resource loader
-        // attempt to load a site-specific version; also make sure the site
+        try {
-        // we're loading for is not the default site, in which case we want to
+            resource.setName(resourceName);
-        // skip to the second resource loader directly
+            resolveResource(resource, _siteLoader);
-        if (skey.siteId != -1 && skey.siteId != SiteIdentifier.DEFAULT_SITE_ID) {
+        } catch (ResourceNotFoundException rnfe) {
-            // try loading it via the site-specific resource loader
+            // nothing to worry about here
-            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
+        // then try the servlet context loader if we didn't find a
-        // resource
+        // site-specific resource
         if (resource.getData() == null) {
             resource.setName(skey.path);
             resolveResource(resource, _contextLoader);