Author: markt
Date: Mon Nov 17 08:01:08 2014
New Revision: 1640088
URL: http://svn.apache.org/r1640088
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57216
Catch "/" as an invalid setting for context path and improve handling of
null values.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1640088&r1=1640087&r2=1640088&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Nov 17
08:01:08 2014
@@ -2008,13 +2008,20 @@ public class StandardContext extends Con
*/
@Override
public void setPath(String path) {
- if (path == null || (!path.equals("") && !path.startsWith("/"))) {
+ boolean invalid = false;
+ if (path == null || path.equals("/")) {
+ path = "";
+ invalid = true;
+ } else if (!path.equals("") && !path.startsWith("/")) {
this.path = "/" + path;
- log.warn(sm.getString(
- "standardContext.pathInvalid", path, this.path));
+ invalid = true;
} else {
this.path = path;
}
+ if (invalid) {
+ log.warn(sm.getString(
+ "standardContext.pathInvalid", path, this.path));
+ }
encodedPath = urlEncoder.encode(this.path);
if (getName() == null) {
setName(this.path);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
