Author: markt
Date: Tue Jul 21 06:45:24 2009
New Revision: 796162
URL: http://svn.apache.org/viewvc?rev=796162&view=rev
Log:
Mac compiler doesn't like @Override on methods implementing an interface.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java?rev=796162&r1=796161&r2=796162&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Tue
Jul 21 06:45:24 2009
@@ -44,7 +44,7 @@
public static enum AsyncState {
NOT_STARTED, STARTED, DISPATCHING, DISPATCHED, COMPLETING
- };
+ }
protected static Log log = LogFactory.getLog(AsyncContextImpl.class);
@@ -63,25 +63,21 @@
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 @@
}
}
- @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 @@
this.servletResponse = servletResponse;
}
- @Override
public boolean hasOriginalRequestAndResponse() {
return hasOriginalRequestAndResponse;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]