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 2017/04/19 07:40:24 UTC
struts git commit: WW-4786 Properly handles empty spaces in path
Repository: struts
Updated Branches:
refs/heads/master 13f49a097 -> 9d4aac058
WW-4786 Properly handles empty spaces in path
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9d4aac05
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9d4aac05
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9d4aac05
Branch: refs/heads/master
Commit: 9d4aac0589306e677c36a732c1c34c1da75304be
Parents: 13f49a0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Apr 19 09:40:10 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Apr 19 09:40:10 2017 +0200
----------------------------------------------------------------------
.../org/apache/struts2/tiles/StrutsApplicationResource.java | 5 +----
.../struts2/tiles/StrutsWildcardServletApplicationContext.java | 2 --
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/9d4aac05/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
----------------------------------------------------------------------
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
index 4ff5b54..7153857 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
@@ -37,10 +37,7 @@ public class StrutsApplicationResource extends PostfixedApplicationResource {
@Override
public InputStream getInputStream() throws IOException {
- if (new File(url.getPath()).exists()) {
- return url.openStream();
- }
- return null;
+ return url.openStream();
}
@Override
http://git-wip-us.apache.org/repos/asf/struts/blob/9d4aac05/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 abe90aa..a7383b8 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
@@ -119,8 +119,6 @@ public class StrutsWildcardServletApplicationContext extends ServletApplicationC
Pattern pattern = WildcardUtil.compileWildcardPattern(path);
Map<String, URL> matches = finder.getResourcesMap("");
- LOG.trace("Found resources {} matching pattern {}", matches, path);
-
for (String resource : matches.keySet()) {
if (pattern.matcher(resource).matches()) {
URL url = matches.get(resource);