Author: markt
Date: Thu Mar 29 19:55:07 2012
New Revision: 1307079
URL: http://svn.apache.org/viewvc?rev=1307079&view=rev
Log:
Whitespace / import police
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java
tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java
tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java
tomcat/trunk/java/org/apache/tomcat/spdy/SpdyStream.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
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=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Mar 29 19:55:07 2012
@@ -183,7 +183,7 @@ public abstract class AbstractHttp11Prot
public void setMaxKeepAliveRequests(int mkar) {
endpoint.setMaxKeepAliveRequests(mkar);
}
-
+
protected NpnHandler npnHandler;
public void setNpnHandler(String impl) {
try {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Mar
29 19:55:07 2012
@@ -19,14 +19,12 @@ package org.apache.coyote.http11;
import java.io.IOException;
import org.apache.coyote.AbstractProtocol;
-import org.apache.coyote.Adapter;
import org.apache.coyote.Processor;
import org.apache.coyote.http11.upgrade.UpgradeAprProcessor;
import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
-import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.AprEndpoint.Handler;
import org.apache.tomcat.util.net.SocketStatus;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Mar
29 19:55:07 2012
@@ -84,7 +84,7 @@ public class Http11NioProtocol extends A
npnHandler.init(getEndpoint(), 0, adapter);
}
}
-
+
// -------------------- Properties--------------------
private Http11ConnectionHandler cHandler;
@@ -222,7 +222,7 @@ public class Http11NioProtocol extends A
}
return super.process(socket, status);
}
-
+
/**
* Expected to be used by the handler once the processor is no longer
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Thu Mar 29
19:55:07 2012
@@ -91,7 +91,7 @@ public class Http11Protocol extends Abst
this.disableKeepAlivePercentage = disableKeepAlivePercentage;
}
}
-
+
@Override
public void start() throws Exception {
super.start();
@@ -144,7 +144,7 @@ public class Http11Protocol extends Abst
}
return super.process(socket, status);
}
-
+
/**
* Expected to be used by the handler once the processor is no longer
* required.
Modified: tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java Thu Mar 29
19:55:07 2012
@@ -28,30 +28,30 @@ import org.apache.tomcat.util.net.Socket
* SPDY. This is only available for APR, will replace the HTTP framing.
*/
public interface NpnHandler {
-
- /**
+
+ /**
* Check if the socket has negotiated the right NPN and process it.
- *
+ *
* @param socket
* @param status
* @return OPEN if the socket doesn't have the right npn.
* CLOSE if processing is done. LONG to request read polling.
*/
SocketState process(SocketWrapper<?> socket, SocketStatus status);
-
+
/**
* Initialize the npn handler.
- *
+ *
* @param ep
* @param sslContext
* @param adapter
*/
public void init(final AbstractEndpoint ep, long sslContext, Adapter
adapter);
- /**
- * Called when a SSLSocket or SSLEngine are first used, to initialize
+ /**
+ * Called when a SSLSocket or SSLEngine are first used, to initialize
* NPN extension.
- *
+ *
* @param socket SSLEngine or SSLSocket
*/
void onCreateEngine(Object socket);
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java Thu Mar 29
19:55:07 2012
@@ -19,7 +19,6 @@ package org.apache.coyote.spdy;
import java.io.IOException;
import org.apache.coyote.Adapter;
-import org.apache.coyote.http11.Http11AprProtocol;
import org.apache.coyote.http11.NpnHandler;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -95,9 +94,9 @@ public class SpdyAprNpnHandler implement
SocketWrapper<Long> socketW = (SocketWrapper<Long>) socketO;
long socket = socketW.getSocket().longValue();
-
+
if (! spdyContext.getNetSupport().isSpdy(socketW.getSocket())) {
- return SocketState.OPEN;
+ return SocketState.OPEN;
}
try {
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Thu Mar 29
19:55:07 2012
@@ -102,7 +102,7 @@ public class SpdyProcessor extends Abstr
if (inFrame.remaining() == 0 && inFrame.isHalfClose()) {
return -1;
}
-
+
int rd = Math.min(inFrame.remaining(), bchunk.getBytes().length);
System.arraycopy(inFrame.data, inFrame.off, bchunk.getBytes(),
bchunk.getStart(), rd);
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/CompressDeflater6.java Thu Mar 29
19:55:07 2012
@@ -71,7 +71,7 @@ class CompressDeflater6 implements Compr
// TODO: code to plug in v7-specific. It is marginally faster.
return new CompressDeflater6();
}
-
+
public void recycle() {
// TODO
}
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportOpenSSL.java Thu Mar 29
19:55:07 2012
@@ -42,16 +42,16 @@ public class NetSupportOpenSSL extends S
}
});
//}
- con.setNpn("spdy/2");
+ con.setNpn("spdy/2");
}
-
+
@Override
public boolean isSpdy(Object socketW) {
byte[] proto = new byte[32];
int len = SSLExt.getNPN((Long) socketW, proto);
return len == 6; // todo: check spdy/2
}
-
+
@Override
public SpdyConnection getConnection(String host, int port) throws
IOException {
SpdyConnectionAprSocket spdy = new SpdyConnectionAprSocket(ctx);
@@ -78,7 +78,7 @@ public class NetSupportOpenSSL extends S
public void onAccept(Object socket) throws IOException {
onAcceptLong((Long) socket);
}
-
+
public void onAcceptLong(long socket) throws IOException {
SpdyConnectionAprSocket spdy = new SpdyConnectionAprSocket(ctx);
AprSocket s = con.socket(socket);
@@ -209,5 +209,5 @@ public class NetSupportOpenSSL extends S
}
}
-
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/NetSupportSocket.java Thu Mar 29
19:55:07 2012
@@ -30,7 +30,7 @@ public class NetSupportSocket extends Sp
public void onCreateEngine(Object engine) {
}
-
+
public boolean isSpdy(Object socketW) {
return false;
}
@@ -48,9 +48,9 @@ public class NetSupportSocket extends Sp
ex.printStackTrace();
throw ex;
}
-
+
}
-
+
protected Socket getSocket(String host, int port) throws IOException {
try {
@@ -61,12 +61,12 @@ public class NetSupportSocket extends Sp
socket.startHandshake();
return socket;
} else {
- return new Socket(host, port);
+ return new Socket(host, port);
}
} catch (NoSuchAlgorithmException e) {
throw new IOException(e);
}
-
+
}
boolean running = true;
@@ -84,7 +84,7 @@ public class NetSupportSocket extends Sp
ch.onBlockingSocket();
}
-
+
@Override
public void listen(final int port, String cert, String key) throws
IOException {
ctx.getExecutor().execute(new Runnable() {
@@ -167,6 +167,6 @@ public class NetSupportSocket extends Sp
}
}
}
-
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyConnection.java Thu Mar 29
19:55:07 2012
@@ -305,7 +305,7 @@ public abstract class SpdyConnection { /
*
* With a nb transport it should call drain directly.
*/
- public void nonBlockingSend(SpdyFrame oframe, SpdyStream proc)
+ public void nonBlockingSend(SpdyFrame oframe, SpdyStream proc)
throws IOException {
queueFrame(oframe, proc, oframe.pri == 0 ? outQueue : prioriyQueue);
getSpdyContext().getExecutor().execute(nbDrain);
@@ -322,7 +322,7 @@ public abstract class SpdyConnection { /
/**
* Add the frame to the queue and send until the queue is empty.
- *
+ *
*/
public void send(SpdyFrame oframe, SpdyStream proc)
throws IOException {
@@ -341,7 +341,7 @@ public abstract class SpdyConnection { /
// all sync for adding/removing is on outQueue
synchronized (outQueue) {
- queue.add(oframe);
+ queue.add(oframe);
}
}
@@ -537,7 +537,7 @@ public abstract class SpdyConnection { /
}
/**
- * Process a SPDY connection. Called in the input thread, should not
+ * Process a SPDY connection. Called in the input thread, should not
* block.
*
* @return
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyContext.java Thu Mar 29
19:55:07 2012
@@ -57,13 +57,13 @@ public final class SpdyContext {
private NetSupport netSupport;
- public static abstract class NetSupport {
+ public abstract static class NetSupport {
protected SpdyContext ctx;
-
+
public void setSpdyContext(SpdyContext ctx) {
this.ctx = ctx;
}
-
+
public abstract SpdyConnection getConnection(String host, int port)
throws IOException;
public void onCreateEngine(Object engine) {
@@ -83,10 +83,10 @@ public final class SpdyContext {
public void stop() throws IOException {
}
}
-
+
public SpdyContext() {
}
-
+
public void setTlsComprression(boolean tls, boolean compress) {
this.tls = tls;
this.compression = compress;
@@ -153,11 +153,11 @@ public final class SpdyContext {
// non-ssl mode must be set explicitly
throw new RuntimeException("SSL NextProtoclNegotiation no
supported.");
}
-
+
return netSupport;
}
-
-
+
+
/**
* SPDY is a multiplexed protocol - the SpdyProcessors will be executed on
* this executor.
@@ -173,7 +173,7 @@ public final class SpdyContext {
}
SpdyHandler handler;
-
+
public SpdyHandler getHandler() {
return handler;
}
@@ -184,18 +184,18 @@ public final class SpdyContext {
public static interface SpdyHandler {
public void onStream(SpdyConnection spdyCon, SpdyStream ch) throws
IOException;
-
+
}
/**
* A handler implementing this interface will be called in the 'io' thread
- the
- * thread reading the multiplexed stream, and in the case of non-blocking
+ * thread reading the multiplexed stream, and in the case of non-blocking
* transports also handling polling the socket.
- *
+ *
*/
public static interface NonBlockingSpdyHandler extends SpdyHandler {
}
-
+
/**
* Client mode: return a connection for host/port.
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyFrame.java Thu Mar 29 19:55:07
2012
@@ -350,5 +350,4 @@ public class SpdyFrame {
public boolean isData() {
return !c;
}
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/spdy/SpdyStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/spdy/SpdyStream.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/spdy/SpdyStream.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/spdy/SpdyStream.java Thu Mar 29
19:55:07 2012
@@ -153,8 +153,8 @@ public class SpdyStream implements Runna
}
/**
- * Waits and return the next frame.
- *
+ * Waits and return the next frame.
+ *
* First frame will be the control frame
*/
public SpdyFrame getFrame(long to) throws IOException {
@@ -262,7 +262,7 @@ public class SpdyStream implements Runna
public InputStream getInputStream() {
return new SpdyInputStream();
}
-
+
class SpdyInputStream extends InputStream {
SpdyFrame current = null;
long to = 10000; // TODO
@@ -276,7 +276,7 @@ public class SpdyStream implements Runna
current = getFrame(to);
}
}
-
+
@Override
public int read() throws IOException {
fill();
@@ -285,7 +285,7 @@ public class SpdyStream implements Runna
}
return current.readByte();
}
-
+
public int read(byte b[], int off, int len) throws IOException {
fill();
if (current == null) {
@@ -297,15 +297,15 @@ public class SpdyStream implements Runna
current.off += rd;
return rd;
}
-
+
public int available() throws IOException {
return 0;
}
public void close() throws IOException {
// send RST if not closed
}
-
-
-
+
+
+
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1307079&r1=1307078&r2=1307079&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Thu Mar 29
19:55:07 2012
@@ -128,7 +128,7 @@ public class JIoEndpoint extends Abstrac
public SocketState process(SocketWrapper<Socket> socket,
SocketStatus status);
public SSLImplementation getSslImplementation();
- public void beforeHandshake(SocketWrapper<Socket> socket);
+ public void beforeHandshake(SocketWrapper<Socket> socket);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
