Author: markt
Date: Tue May 23 14:07:40 2017
New Revision: 1795916
URL: http://svn.apache.org/viewvc?rev=1795916&view=rev
Log:
Remove UNKNOWN mapping type - not included in spec
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletMapping.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/MappingMatch.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletMapping.java?rev=1795916&r1=1795915&r2=1795916&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletMapping.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletMapping.java Tue May 23
14:07:40 2017
@@ -47,7 +47,7 @@ public interface HttpServletMapping {
String getServletName();
/**
- * @return The type of match ({@link MappingMatch#UNKNOWN} if not known)
+ * @return The type of match ({@code null} if not known)
*/
MappingMatch getMappingMatch();
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1795916&r1=1795915&r2=1795916&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Tue May 23
14:07:40 2017
@@ -192,7 +192,7 @@ public interface HttpServletRequest exte
@Override
public MappingMatch getMappingMatch() {
- return MappingMatch.UNKNOWN;
+ return null;
}
};
}
Modified: tomcat/trunk/java/javax/servlet/http/MappingMatch.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/MappingMatch.java?rev=1795916&r1=1795915&r2=1795916&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/MappingMatch.java (original)
+++ tomcat/trunk/java/javax/servlet/http/MappingMatch.java Tue May 23 14:07:40
2017
@@ -27,6 +27,5 @@ public enum MappingMatch {
DEFAULT,
EXACT,
EXTENSION,
- PATH,
- UNKNOWN
+ PATH
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1795916&r1=1795915&r2=1795916&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Tue May
23 14:07:40 2017
@@ -39,36 +39,37 @@ public class ApplicationMapping {
} else {
servletName = mappingData.wrapper.getName();
}
- switch (mappingData.matchType) {
- case CONTEXT_ROOT:
- mapping = new MappingImpl("", "", mappingData.matchType,
servletName);
- break;
- case DEFAULT:
- mapping = new MappingImpl("", "/", mappingData.matchType,
servletName);
- break;
- case EXACT:
- mapping = new
MappingImpl(mappingData.wrapperPath.toString().substring(1),
- mappingData.wrapperPath.toString(),
mappingData.matchType, servletName);
- break;
- case EXTENSION:
- String path = mappingData.wrapperPath.toString();
- int extIndex = path.lastIndexOf('.');
- mapping = new MappingImpl(path.substring(1, extIndex),
- "*" + path.substring(extIndex),
mappingData.matchType, servletName);
- break;
- case PATH:
- String matchValue;
- if (mappingData.pathInfo.isNull()) {
- matchValue = null;
- } else {
- matchValue =
mappingData.pathInfo.toString().substring(1);
- }
- mapping = new MappingImpl(matchValue,
mappingData.wrapperPath.toString() + "/*",
- mappingData.matchType, servletName);
- break;
- case UNKNOWN:
- mapping = new MappingImpl("", "", mappingData.matchType,
servletName);
- break;
+ if (mappingData.matchType == null) {
+ mapping = new MappingImpl("", "", null, servletName);
+ } else {
+ switch (mappingData.matchType) {
+ case CONTEXT_ROOT:
+ mapping = new MappingImpl("", "",
mappingData.matchType, servletName);
+ break;
+ case DEFAULT:
+ mapping = new MappingImpl("", "/",
mappingData.matchType, servletName);
+ break;
+ case EXACT:
+ mapping = new
MappingImpl(mappingData.wrapperPath.toString().substring(1),
+ mappingData.wrapperPath.toString(),
mappingData.matchType, servletName);
+ break;
+ case EXTENSION:
+ String path = mappingData.wrapperPath.toString();
+ int extIndex = path.lastIndexOf('.');
+ mapping = new MappingImpl(path.substring(1, extIndex),
+ "*" + path.substring(extIndex),
mappingData.matchType, servletName);
+ break;
+ case PATH:
+ String matchValue;
+ if (mappingData.pathInfo.isNull()) {
+ matchValue = null;
+ } else {
+ matchValue =
mappingData.pathInfo.toString().substring(1);
+ }
+ mapping = new MappingImpl(matchValue,
mappingData.wrapperPath.toString() + "/*",
+ mappingData.matchType, servletName);
+ break;
+ }
}
}
Modified: tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java?rev=1795916&r1=1795915&r2=1795916&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java Tue May 23
14:07:40 2017
@@ -46,7 +46,7 @@ public class MappingData {
public final MessageBytes redirectPath = MessageBytes.newInstance();
// Fields used by ApplicationMapping to implement
javax.servlet.http.Mapping
- public MappingMatch matchType = MappingMatch.UNKNOWN;
+ public MappingMatch matchType = null;
public void recycle() {
host = null;
@@ -60,6 +60,6 @@ public class MappingData {
wrapperPath.recycle();
pathInfo.recycle();
redirectPath.recycle();
- matchType = MappingMatch.UNKNOWN;
+ matchType = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
