From 4e8c9a3f3c52dcb6539ef161de6762a55d0665e7 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 21 Jul 2009 06:45:24 +0000 Subject: [PATCH] Mac compiler doesn't like @Override on methods implementing an interface. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@796162 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/AsyncContextImpl.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/java/org/apache/catalina/connector/AsyncContextImpl.java b/java/org/apache/catalina/connector/AsyncContextImpl.java index caebf052c..1c14b8c93 100644 --- a/java/org/apache/catalina/connector/AsyncContextImpl.java +++ b/java/org/apache/catalina/connector/AsyncContextImpl.java @@ -44,7 +44,7 @@ public class AsyncContextImpl implements AsyncContext { public static enum AsyncState { NOT_STARTED, STARTED, DISPATCHING, DISPATCHED, COMPLETING - }; + } protected static Log log = LogFactory.getLog(AsyncContextImpl.class); @@ -63,25 +63,21 @@ public class AsyncContextImpl implements AsyncContext { this.request = request; } - @Override public void complete() { // TODO SERVLET3 - async doInternalComplete(false); } - @Override public void dispatch() { HttpServletRequest sr = (HttpServletRequest)getServletRequest(); String path = sr.getRequestURI(); dispatch(path); } - @Override public void dispatch(String path) { dispatch(request.getServletContext(),path); } - @Override public void dispatch(ServletContext context, String path) { // TODO SERVLET3 - async if (this.state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING)) { @@ -115,17 +111,14 @@ public class AsyncContextImpl implements AsyncContext { } } - @Override public ServletRequest getRequest() { return getServletRequest(); } - @Override public ServletResponse getResponse() { return getServletResponse(); } - @Override public void start(Runnable run) { // TODO SERVLET3 - async this.dispatch = run; @@ -186,7 +179,6 @@ public class AsyncContextImpl implements AsyncContext { this.servletResponse = servletResponse; } - @Override public boolean hasOriginalRequestAndResponse() { return hasOriginalRequestAndResponse; } -- 2.11.0