Correct, servlet 3.0 requires minimum 1.6
so we don't have to build down to 1.5 anymore
Filip
On 07/22/2009 10:48 AM, sebb wrote:
On 22/07/2009, ma...@apache.org<ma...@apache.org> wrote:
Author: markt
Date: Wed Jul 22 14:29:09 2009
New Revision: 796739
URL: http://svn.apache.org/viewvc?rev=796739&view=rev
Log:
Restore the @Overrides. Eclipse on my Mac wasn't configured right. Sorry for
the noise.
The build.properties.default file has
compile.source=1.5
compile.target=1.5
I get errors such as
[javac] Compiling 1029 source files
[javac]
tomcat-trunk\java\org\apache\catalina\connector\AsyncContextImpl.java:66:
method does not override a method from
its superclass
[javac] @Override
when compiling with
java version "1.5.0_18"
Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_18-b02)
Java HotSpot(TM) Client VM (build 1.5.0_18-b02, mixed mode, sharing)
Microsoft Windows XP [Version 5.1.2600]
So IMO either the minimum Java version needs to be updated to Java
1.6, or the @Override markers should be reserved for actual overrides,
rather than implementations.
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=796739&r1=796738&r2=796739&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/AsyncContextImpl.java Wed
Jul 22 14:29:09 2009
@@ -63,21 +63,25 @@
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 (state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING) ||
@@ -113,14 +117,17 @@
}
}
+ @Override
public ServletRequest getRequest() {
return getServletRequest();
}
+ @Override
public ServletResponse getResponse() {
return getServletResponse();
}
+ @Override
public void start(final Runnable run) {
if (state.compareAndSet(AsyncState.STARTED, AsyncState.DISPATCHING) ||
state.compareAndSet(AsyncState.DISPATCHED,
AsyncState.DISPATCHING)) {
@@ -195,6 +202,7 @@
this.servletResponse = servletResponse;
}
+ @Override
public boolean hasOriginalRequestAndResponse() {
return hasOriginalRequestAndResponse;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
