Author: markt
Date: Sun Feb 27 23:08:45 2011
New Revision: 1075176
URL: http://svn.apache.org/viewvc?rev=1075176&view=rev
Log:
Fix Eclipse warnings
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Constants.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Sun Feb
27 23:08:45 2011
@@ -88,6 +88,7 @@ public class CometEventImpl implements C
this.eventSubType = eventSubType;
}
+ @Override
public void close() throws IOException {
if (request == null) {
throw new
IllegalStateException(sm.getString("cometEvent.nullRequest"));
@@ -98,22 +99,27 @@ public class CometEventImpl implements C
if (iscomet) request.cometClose();
}
+ @Override
public EventSubType getEventSubType() {
return eventSubType;
}
+ @Override
public EventType getEventType() {
return eventType;
}
+ @Override
public HttpServletRequest getHttpServletRequest() {
return request.getRequest();
}
+ @Override
public HttpServletResponse getHttpServletResponse() {
return response.getResponse();
}
+ @Override
public void setTimeout(int timeout) throws IOException, ServletException,
UnsupportedOperationException {
if (request.getAttribute("org.apache.tomcat.comet.timeout.support") ==
Boolean.TRUE) {
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun Feb 27
23:08:45 2011
@@ -1005,8 +1005,6 @@ public class Connector extends Lifecycle
// -------------------- JMX registration --------------------
- private ObjectName onameProtocolHandler;
-
@Override
protected String getDomainInternal() {
return MBeanUtils.getDomain(getService());
Modified: tomcat/trunk/java/org/apache/catalina/connector/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Constants.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Constants.java Sun Feb 27
23:08:45 2011
@@ -23,11 +23,4 @@ public final class Constants {
public static final String Package = "org.apache.catalina.connector";
- public static final int DEFAULT_CONNECTION_LINGER = -1;
- public static final int DEFAULT_CONNECTION_TIMEOUT = 60000;
- public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 300000;
- public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
-
- public static final int PROCESSOR_IDLE = 0;
- public static final int PROCESSOR_ACTIVE = 1;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java Sun
Feb 27 23:08:45 2011
@@ -88,6 +88,7 @@ public class CoyoteInputStream
AccessController.doPrivileged(
new PrivilegedExceptionAction<Integer>(){
+ @Override
public Integer run() throws IOException{
Integer integer =
Integer.valueOf(ib.readByte());
return integer;
@@ -117,6 +118,7 @@ public class CoyoteInputStream
AccessController.doPrivileged(
new PrivilegedExceptionAction<Integer>(){
+ @Override
public Integer run() throws IOException{
Integer integer =
Integer.valueOf(ib.available());
return integer;
@@ -146,6 +148,7 @@ public class CoyoteInputStream
AccessController.doPrivileged(
new PrivilegedExceptionAction<Integer>(){
+ @Override
public Integer run() throws IOException{
Integer integer =
Integer.valueOf(ib.read(b, 0, b.length));
@@ -178,6 +181,7 @@ public class CoyoteInputStream
AccessController.doPrivileged(
new PrivilegedExceptionAction<Integer>(){
+ @Override
public Integer run() throws IOException{
Integer integer =
Integer.valueOf(ib.read(b, off, len));
@@ -219,6 +223,7 @@ public class CoyoteInputStream
AccessController.doPrivileged(
new PrivilegedExceptionAction<Void>(){
+ @Override
public Void run() throws IOException{
ib.close();
return null;
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java Sun
Feb 27 23:08:45 2011
@@ -51,6 +51,7 @@ public class CoyotePrincipal implements
*/
protected String name = null;
+ @Override
public String getName() {
return (this.name);
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Sun Feb 27
23:08:45 2011
@@ -272,6 +272,7 @@ public class InputBuffer extends Reader
*
* @throws IOException An underlying IOException occurred
*/
+ @Override
public int realReadBytes(byte cbuf[], int off, int len)
throws IOException {
@@ -319,6 +320,7 @@ public class InputBuffer extends Reader
* been read before, they are ignored. If a mark was set, then the
* mark is lost.
*/
+ @Override
public void realWriteChars(char c[], int off, int len)
throws IOException {
markPos = -1;
@@ -332,6 +334,7 @@ public class InputBuffer extends Reader
}
+ @Override
public int realReadChars(char cbuf[], int off, int len)
throws IOException {
@@ -518,6 +521,7 @@ public class InputBuffer extends Reader
conv = AccessController.doPrivileged(
new PrivilegedExceptionAction<B2CConverter>(){
+ @Override
public B2CConverter run() throws IOException {
return new B2CConverter(enc);
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1075176&r1=1075175&r2=1075176&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Sun Feb
27 23:08:45 2011
@@ -546,16 +546,6 @@ public class OutputBuffer extends Writer
// -------------------- BufferedOutputStream compatibility
- /**
- * Real write - this buffer will be sent to the client
- */
- public void flushBytes()
- throws IOException {
-
- bb.flushBuffer();
-
- }
-
public long getContentWritten() {
return bytesWritten + charsWritten;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
