Author: markt Date: Fri Oct 9 13:51:12 2015 New Revision: 1707728 URL: http://svn.apache.org/viewvc?rev=1707728&view=rev Log: Take advantage of new default methods
Modified: tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java tomcat/trunk/test/org/apache/catalina/startup/TestListener.java tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java Modified: tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java?rev=1707728&r1=1707727&r2=1707728&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java Fri Oct 9 13:51:12 2015 @@ -206,12 +206,6 @@ public class CrawlerSessionManagerValve @Override - public void valueBound(HttpSessionBindingEvent event) { - // NOOP - } - - - @Override public void valueUnbound(HttpSessionBindingEvent event) { String clientIp = sessionIdClientIp.remove(event.getSession().getId()); if (clientIp != null) { Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSessionListener.java Fri Oct 9 13:51:12 2015 @@ -30,12 +30,6 @@ public class WsSessionListener implement @Override - public void sessionCreated(HttpSessionEvent se) { - // NO-OP - } - - - @Override public void sessionDestroyed(HttpSessionEvent se) { wsServerContainer.closeAuthenticatedSession(se.getSession().getId()); } Modified: tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java Fri Oct 9 13:51:12 2015 @@ -71,11 +71,6 @@ public class TestNamingContextListener e public static final class Bug49132Listener implements ServletContextListener { @Override - public void contextDestroyed(ServletContextEvent sce) { - // NOOP - } - - @Override public void contextInitialized(ServletContextEvent sce) { javax.naming.Context initCtx; try { @@ -151,11 +146,6 @@ public class TestNamingContextListener e ServletContextListener { @Override - public void contextDestroyed(ServletContextEvent sce) { - // NOOP - } - - @Override public void contextInitialized(ServletContextEvent sce) { javax.naming.Context initCtx; try { Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestListener.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Fri Oct 9 13:51:12 2015 @@ -88,11 +88,6 @@ public class TestListener extends Tomcat public void contextInitialized(ServletContextEvent sce) { initialized = true; } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - // NOOP - } } public static class SCL2 implements ServletContextListener { @@ -102,11 +97,6 @@ public class TestListener extends Tomcat ServletContext sc = sce.getServletContext(); sc.addListener(SCL3.class.getName()); } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - // NOOP - } } public static class SCL3 implements ServletContextListener { @@ -117,10 +107,5 @@ public class TestListener extends Tomcat public void contextInitialized(ServletContextEvent sce) { initialized = true; } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - // NOOP - } } } Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java?rev=1707728&r1=1707727&r2=1707728&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java (original) +++ tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java Fri Oct 9 13:51:12 2015 @@ -93,10 +93,5 @@ public class TestELInterpreterFactory ex sce.getServletContext().setInitParameter(ELInterpreter.class.getName(), SimpleELInterpreter.class.getName()); } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - // NO-OP - } } } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java?rev=1707728&r1=1707727&r2=1707728&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java Fri Oct 9 13:51:12 2015 @@ -22,11 +22,6 @@ import javax.servlet.ServletContextListe public final class DrawboardContextListener implements ServletContextListener { @Override - public void contextInitialized(ServletContextEvent sce) { - // NO-OP - } - - @Override public void contextDestroyed(ServletContextEvent sce) { // Shutdown our room. Room room = DrawboardEndpoint.getRoom(false); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org