Author: markt
Date: Tue Aug 30 13:10:48 2016
New Revision: 1758384
URL: http://svn.apache.org/viewvc?rev=1758384&view=rev
Log:
Use a default method to simplify implementations
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1758384&r1=1758383&r2=1758384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Aug 30 13:10:48 2016
@@ -875,7 +875,9 @@ public interface Context extends Contain
* @param pattern URL pattern to be mapped
* @param name Name of the corresponding servlet to execute
*/
- public void addServletMapping(String pattern, String name);
+ public default void addServletMapping(String pattern, String name) {
+ addServletMapping(pattern, name, false);
+ }
/**
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=1758384&r1=1758383&r2=1758384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Aug 30
13:10:48 2016
@@ -3112,22 +3112,6 @@ public class StandardContext extends Con
*
* @param pattern URL pattern to be mapped
* @param name Name of the corresponding servlet to execute
- *
- * @exception IllegalArgumentException if the specified servlet name
- * is not known to this Context
- */
- @Override
- public void addServletMapping(String pattern, String name) {
- addServletMapping(pattern, name, false);
- }
-
-
- /**
- * Add a new servlet mapping, replacing any existing mapping for
- * the specified pattern.
- *
- * @param pattern URL pattern to be mapped
- * @param name Name of the corresponding servlet to execute
* @param jspWildCard true if name identifies the JspServlet
* and pattern contains a wildcard; false otherwise
*
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1758384&r1=1758383&r2=1758384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Tue Aug 30
13:10:48 2016
@@ -567,8 +567,6 @@ public class FailedContext extends Lifec
public void removeSecurityRole(String role) { /* NO-OP */ }
@Override
- public void addServletMapping(String pattern, String name) { /* NO-OP */ }
- @Override
public void addServletMapping(String pattern, String name,
boolean jspWildcard) { /* NO-OP */ }
@Override
Modified: tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java?rev=1758384&r1=1758383&r2=1758384&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java Tue Aug 30
13:10:48 2016
@@ -755,11 +755,6 @@ public class TesterContext implements Co
}
@Override
- public void addServletMapping(String pattern, String name) {
- // NO-OP
- }
-
- @Override
public void addServletMapping(String pattern, String name,
boolean jspWildcard) {
// NO-OP
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
