Author: markt
Date: Thu Aug 16 19:51:27 2012
New Revision: 1374018
URL: http://svn.apache.org/viewvc?rev=1374018&view=rev
Log:
Code clean-up
- Remove unnecessary warnings
- Java 7 <>
- UCDetector use of final
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Aug 16 19:51:27 2012
@@ -811,7 +811,6 @@ public abstract class AbstractHttp11Proc
InputFilter savedBody = new SavedRequestInputFilter(body);
savedBody.setRequest(request);
- @SuppressWarnings("unchecked")
AbstractInputBuffer<S> internalBuffer = (AbstractInputBuffer<S>)
request.getInputBuffer();
internalBuffer.addActiveFilter(savedBody);
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Aug 16 19:51:27 2012
@@ -177,7 +177,6 @@ public abstract class AbstractHttp11Prot
}
protected NpnHandler<S> npnHandler;
- @SuppressWarnings("unchecked")
public void setNpnHandler(String impl) {
try {
Class<?> c = Class.forName(impl);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Aug
16 19:51:27 2012
@@ -78,13 +78,13 @@ public class Http11AprProcessor extends
/**
* Input.
*/
- protected InternalAprInputBuffer inputBuffer = null;
+ protected final InternalAprInputBuffer inputBuffer;
/**
* Output.
*/
- protected InternalAprOutputBuffer outputBuffer = null;
+ protected final InternalAprOutputBuffer outputBuffer;
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Aug
16 19:51:27 2012
@@ -85,13 +85,13 @@ public class Http11NioProcessor extends
/**
* Input.
*/
- protected InternalNioInputBuffer inputBuffer = null;
+ protected final InternalNioInputBuffer inputBuffer;
/**
* Output.
*/
- protected InternalNioOutputBuffer outputBuffer = null;
+ protected final InternalNioOutputBuffer outputBuffer;
/**
@@ -105,11 +105,9 @@ public class Http11NioProcessor extends
*/
protected SocketWrapper<NioChannel> socket = null;
- protected volatile boolean wantOnWritePossible = false;
// --------------------------------------------------------- Public Methods
-
/**
* Process pipelined HTTP requests using the specified input and output
* streams.
@@ -382,7 +380,6 @@ public class Http11NioProcessor extends
public void recycleInternal() {
socket = null;
sendfileData = null;
- wantOnWritePossible = false;
}
@@ -611,7 +608,6 @@ public class Http11NioProcessor extends
canWrite.set(true);
} else {
canWrite.set(false);
- wantOnWritePossible = true;
}
} else {
throw new IllegalStateException("Calling canWrite
asynchronously is illegal.");
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Aug 16
19:51:27 2012
@@ -70,13 +70,13 @@ public class Http11Processor extends Abs
/**
* Input.
*/
- protected InternalInputBuffer inputBuffer = null;
+ protected final InternalInputBuffer inputBuffer ;
/**
* Output.
*/
- protected InternalOutputBuffer outputBuffer = null;
+ protected final InternalOutputBuffer outputBuffer;
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Thu
Aug 16 19:51:27 2012
@@ -80,7 +80,7 @@ public class InternalAprInputBuffer exte
/**
* Direct byte buffer used to perform actual reading.
*/
- private ByteBuffer bbuf;
+ private final ByteBuffer bbuf;
/**
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu
Aug 16 19:51:27 2012
@@ -80,7 +80,7 @@ public class InternalAprOutputBuffer ext
/**
* Direct byte buffer used for writing.
*/
- private ByteBuffer bbuf = null;
+ private final ByteBuffer bbuf;
// --------------------------------------------------------- Public Methods
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu
Aug 16 19:51:27 2012
@@ -763,7 +763,7 @@ public class InternalNioInputBuffer exte
return HeaderParseStatus.HAVE_MORE_HEADERS;
}
- private HeaderParseData headerData = new HeaderParseData();
+ private final HeaderParseData headerData = new HeaderParseData();
public static class HeaderParseData {
/**
* When parsing header name: first character of the header.<br />
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu
Aug 16 19:51:27 2012
@@ -103,11 +103,11 @@ public class InternalNioOutputBuffer ext
/**
* Number of bytes last written
*/
- protected AtomicInteger lastWrite = new AtomicInteger(1);
+ protected final AtomicInteger lastWrite = new AtomicInteger(1);
protected class ByteBufferHolder {
- private ByteBuffer buf;
- private AtomicBoolean flipped;
+ private final ByteBuffer buf;
+ private final AtomicBoolean flipped;
public ByteBufferHolder(ByteBuffer buf, boolean flipped) {
this.buf = buf;
this.flipped = new AtomicBoolean(flipped);
@@ -428,7 +428,7 @@ public class InternalNioOutputBuffer ext
if (blocking)
bufferedWrite = null;
else
- bufferedWrite = new LinkedBlockingDeque<ByteBufferHolder>();
+ bufferedWrite = new LinkedBlockingDeque<>();
}
public void setBufferedWriteSize(int bufferedWriteSize) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1374018&r1=1374017&r2=1374018&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Thu
Aug 16 19:51:27 2012
@@ -69,7 +69,7 @@ public class InternalOutputBuffer extend
/**
* Socket buffer.
*/
- private ByteChunk socketBuffer;
+ private final ByteChunk socketBuffer;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
