svn commit: r1784652 - in /tomcat/trunk/java/javax/servlet/http: HttpServletRequest.java ServletMapping.java

[markt]

Author: markt
Date: Mon Feb 27 20:26:51 2017
New Revision: 1784652

URL: http://svn.apache.org/viewvc?rev=1784652&view=rev
Log:
No functional change.
Modify order to reduce diff when using javap to compare Tomcat's API 
implementation with the reference implementation.

Modified:
    tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
    tomcat/trunk/java/javax/servlet/http/ServletMapping.java

Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1784652&r1=1784651&r2=1784652&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Mon Feb 27 
20:26:51 2017
@@ -184,13 +184,13 @@ public interface HttpServletRequest exte
             }
 
             @Override
-            public MappingMatch getMappingMatch() {
-                return MappingMatch.UNKNOWN;
+            public String getServletName() {
+                return "";
             }
 
             @Override
-            public String getServletName() {
-                return "";
+            public MappingMatch getMappingMatch() {
+                return MappingMatch.UNKNOWN;
             }
         };
     }

Modified: tomcat/trunk/java/javax/servlet/http/ServletMapping.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/ServletMapping.java?rev=1784652&r1=1784651&r2=1784652&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/ServletMapping.java (original)
+++ tomcat/trunk/java/javax/servlet/http/ServletMapping.java Mon Feb 27 
20:26:51 2017
@@ -38,11 +38,6 @@ public interface ServletMapping {
     String getPattern();
 
     /**
-     * @return The type of match ({@link MappingMatch#UNKNOWN} if not known)
-     */
-    MappingMatch getMappingMatch();
-
-    /**
      * @return The name of the servlet (as specified in web.xml,
      *         {@link WebServlet#name()},
      *         {@link javax.servlet.ServletContext#addServlet(String, Class)} 
or
@@ -50,4 +45,9 @@ public interface ServletMapping {
      *         request was mapped to.
      */
     String getServletName();
+
+    /**
+     * @return The type of match ({@link MappingMatch#UNKNOWN} if not known)
+     */
+    MappingMatch getMappingMatch();
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org