You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/18 15:57:04 UTC

[22/30] struts git commit: Overrides method to use defined base instead of fetching it again

Overrides method to use defined base instead of fetching it again


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/66d29d42
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/66d29d42
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/66d29d42

Branch: refs/heads/master
Commit: 66d29d42c388bc17561d1b3d82f447426dda8db5
Parents: 334e6ca
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Wed Jan 13 12:05:58 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Wed Jan 13 12:05:58 2016 +0100

----------------------------------------------------------------------
 .../struts2/tiles/StrutsWildcardServletApplicationContext.java   | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/66d29d42/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index abd78a2..b8f10f9 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -95,6 +95,10 @@ public class StrutsWildcardServletApplicationContext extends ServletApplicationC
         return resources;
     }
 
+    public ApplicationResource getResource(ApplicationResource base, Locale locale) {
+        return base;
+    }
+
     protected Set<ApplicationResource> findResources(String path) throws IOException {
         Set<ApplicationResource> resources = new HashSet<>();