Author: markt
Date: Thu Sep 21 10:25:49 2017
New Revision: 1809144
URL: http://svn.apache.org/viewvc?rev=1809144&view=rev
Log:
Clean-up - no functional change
- fix indentation
- add { } to improve clarity
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809144&r1=1809143&r2=1809144&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Thu Sep 21 10:25:49 2017
@@ -92,15 +92,18 @@ public abstract class AbstractFileResour
// agrees with what was requested
String absPath = normalize(file.getAbsolutePath());
if ((absoluteBase.length() < absPath.length())
- && (canonicalBase.length() < canPath.length())) {
+ && (canonicalBase.length() < canPath.length())) {
absPath = absPath.substring(absoluteBase.length() + 1);
- if (absPath.equals(""))
+ if (absPath.equals("")) {
absPath = "/";
+ }
canPath = canPath.substring(canonicalBase.length() + 1);
- if (canPath.equals(""))
+ if (canPath.equals("")) {
canPath = "/";
- if (!canPath.equals(absPath))
+ }
+ if (!canPath.equals(absPath)) {
return null;
+ }
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
