Author: markt
Date: Thu Jan 15 09:21:45 2015
New Revision: 1652008
URL: http://svn.apache.org/r1652008
Log:
Align formatting to aid checking for differences between the InputBuffer
implementations.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java?rev=1652008&r1=1652007&r2=1652008&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2InputBuffer.java Thu
Jan 15 09:21:45 2015
@@ -44,6 +44,7 @@ public class InternalNio2InputBuffer ext
inputStreamInputBuffer = new SocketInputBuffer();
}
+
// ----------------------------------------------------- Instance Variables
private SocketWrapperBase<Nio2Channel> wrapper;
@@ -70,20 +71,20 @@ public class InternalNio2InputBuffer ext
}
- // ------------------------------------------------------ Protected Methods
-
@Override
protected void init(SocketWrapperBase<Nio2Channel> socketWrapper,
AbstractEndpoint<Nio2Channel> associatedEndpoint) throws
IOException {
wrapper = socketWrapper;
- int bufLength = headerBufferSize +
wrapper.getSocket().getBufHandler().getReadBuffer().capacity();
+ int bufLength = headerBufferSize +
+ wrapper.getSocket().getBufHandler().getReadBuffer().capacity();
if (buf == null || buf.length < bufLength) {
buf = new byte[bufLength];
}
}
+
@Override
protected boolean fill(boolean block) throws IOException, EOFException {
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=1652008&r1=1652007&r2=1652008&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu
Jan 15 09:21:45 2015
@@ -40,9 +40,6 @@ public class InternalNioInputBuffer exte
// ----------------------------------------------------------- Constructors
- /**
- * Alternate constructor.
- */
public InternalNioInputBuffer(Request request, int headerBufferSize) {
super(request, headerBufferSize);
inputStreamInputBuffer = new SocketInputBuffer();
@@ -66,6 +63,7 @@ public class InternalNioInputBuffer exte
super.recycle();
}
+
// ------------------------------------------------------ Protected Methods
@Override
@@ -112,21 +110,17 @@ public class InternalNioInputBuffer exte
// ------------------------------------- InputStreamInputBuffer Inner Class
-
/**
* This class is an input buffer which will read its data from an input
* stream.
*/
- protected class SocketInputBuffer
- implements InputBuffer {
-
+ protected class SocketInputBuffer implements InputBuffer {
/**
* Read bytes into the specified chunk.
*/
@Override
- public int doRead(ByteChunk chunk, Request req )
- throws IOException {
+ public int doRead(ByteChunk chunk, Request req) throws IOException {
if (pos >= lastValid) {
if (!fill(true)) //read body, must be blocking, as the thread
is inside the app
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
