You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/09/03 17:22:01 UTC
svn commit: r1164871 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/main/java/org/apache/http/impl/nio/
httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/
httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/
httpcore-nio/src/main/java...
Author: olegk
Date: Sat Sep 3 15:22:00 2011
New Revision: 1164871
URL: http://svn.apache.org/viewvc?rev=1164871&view=rev
Log:
TABS -> SPACES
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/MessageState.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ContentType.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/BasicFutureCallback.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestSocketOutputBuffer.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java Sat Sep 3 15:22:00 2011
@@ -45,19 +45,19 @@ import org.apache.http.protocol.Executio
@Immutable // provided injected dependencies are immutable
public abstract class AbstractIODispatch<T extends NHttpConnection> implements IOEventDispatch {
- protected abstract T createConnection(IOSession session);
+ protected abstract T createConnection(IOSession session);
- protected abstract void onConnected(T conn);
+ protected abstract void onConnected(T conn);
- protected abstract void onClosed(T conn);
+ protected abstract void onClosed(T conn);
- protected abstract void onException(T conn, IOException ex);
+ protected abstract void onException(T conn, IOException ex);
- protected abstract void onInputReady(T conn);
+ protected abstract void onInputReady(T conn);
- protected abstract void onOutputReady(T conn);
+ protected abstract void onOutputReady(T conn);
- protected abstract void onTimeout(T conn);
+ protected abstract void onTimeout(T conn);
private void ensureNotNull(final T conn) {
if (conn == null) {
@@ -67,7 +67,7 @@ public abstract class AbstractIODispatch
public void connected(final IOSession session) {
@SuppressWarnings("unchecked")
- T conn = (T) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
+ T conn = (T) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
try {
if (conn == null) {
conn = createConnection(session);
@@ -94,9 +94,9 @@ public abstract class AbstractIODispatch
public void disconnected(final IOSession session) {
@SuppressWarnings("unchecked")
- T conn = (T) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
+ T conn = (T) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
if (conn != null) {
- onClosed(conn);
+ onClosed(conn);
}
}
@@ -108,14 +108,14 @@ public abstract class AbstractIODispatch
SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
SSLIOSession.SESSION_KEY);
if (ssliosession == null) {
- onInputReady(conn);
+ onInputReady(conn);
} else {
try {
if (!ssliosession.isInitialized()) {
ssliosession.initialize();
}
if (ssliosession.isAppInputReady()) {
- onInputReady(conn);
+ onInputReady(conn);
}
ssliosession.inboundTransport();
} catch (IOException ex) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java Sat Sep 3 15:22:00 2011
@@ -128,7 +128,7 @@ public class DefaultClientIOEventDispatc
* @return newly created HTTP connection.
*/
@Override
- protected NHttpClientIOTarget createConnection(final IOSession session) {
+ protected NHttpClientIOTarget createConnection(final IOSession session) {
return new DefaultNHttpClientConnection(
session,
createHttpResponseFactory(),
@@ -137,37 +137,37 @@ public class DefaultClientIOEventDispatc
}
@Override
- protected void onConnected(final NHttpClientIOTarget conn) {
+ protected void onConnected(final NHttpClientIOTarget conn) {
int timeout = HttpConnectionParams.getSoTimeout(this.params);
conn.setSocketTimeout(timeout);
Object attachment = conn.getContext().getAttribute(IOSession.ATTACHMENT_KEY);
this.handler.connected(conn, attachment);
- }
+ }
@Override
- protected void onClosed(final NHttpClientIOTarget conn) {
+ protected void onClosed(final NHttpClientIOTarget conn) {
this.handler.closed(conn);
- }
+ }
- @Override
- protected void onException(final NHttpClientIOTarget conn, IOException ex) {
+ @Override
+ protected void onException(final NHttpClientIOTarget conn, IOException ex) {
this.handler.exception(conn, ex);
- }
+ }
- @Override
- protected void onInputReady(final NHttpClientIOTarget conn) {
+ @Override
+ protected void onInputReady(final NHttpClientIOTarget conn) {
conn.consumeInput(this.handler);
- }
+ }
- @Override
- protected void onOutputReady(final NHttpClientIOTarget conn) {
+ @Override
+ protected void onOutputReady(final NHttpClientIOTarget conn) {
conn.produceOutput(this.handler);
- }
+ }
- @Override
- protected void onTimeout(final NHttpClientIOTarget conn) {
+ @Override
+ protected void onTimeout(final NHttpClientIOTarget conn) {
this.handler.timeout(conn);
- }
+ }
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIODispatch.java Sat Sep 3 15:22:00 2011
@@ -89,28 +89,28 @@ public class DefaultServerIODispatch ext
}
@Override
- protected void onClosed(final NHttpServerIOTarget conn) {
+ protected void onClosed(final NHttpServerIOTarget conn) {
this.handler.closed(conn);
- }
+ }
- @Override
- protected void onException(final NHttpServerIOTarget conn, IOException ex) {
+ @Override
+ protected void onException(final NHttpServerIOTarget conn, IOException ex) {
this.handler.exception(conn, ex);
- }
+ }
- @Override
- protected void onInputReady(final NHttpServerIOTarget conn) {
+ @Override
+ protected void onInputReady(final NHttpServerIOTarget conn) {
conn.consumeInput(this.handler);
- }
+ }
- @Override
- protected void onOutputReady(final NHttpServerIOTarget conn) {
+ @Override
+ protected void onOutputReady(final NHttpServerIOTarget conn) {
conn.produceOutput(this.handler);
- }
+ }
- @Override
- protected void onTimeout(final NHttpServerIOTarget conn) {
+ @Override
+ protected void onTimeout(final NHttpServerIOTarget conn) {
this.handler.timeout(conn);
- }
+ }
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java Sat Sep 3 15:22:00 2011
@@ -128,7 +128,7 @@ public class DefaultServerIOEventDispatc
* @return newly created HTTP connection.
*/
@Override
- protected NHttpServerIOTarget createConnection(final IOSession session) {
+ protected NHttpServerIOTarget createConnection(final IOSession session) {
return new DefaultNHttpServerConnection(
session,
createHttpRequestFactory(),
@@ -144,28 +144,28 @@ public class DefaultServerIOEventDispatc
}
@Override
- protected void onClosed(final NHttpServerIOTarget conn) {
+ protected void onClosed(final NHttpServerIOTarget conn) {
this.handler.closed(conn);
- }
+ }
- @Override
- protected void onException(final NHttpServerIOTarget conn, IOException ex) {
+ @Override
+ protected void onException(final NHttpServerIOTarget conn, IOException ex) {
this.handler.exception(conn, ex);
- }
+ }
- @Override
- protected void onInputReady(final NHttpServerIOTarget conn) {
+ @Override
+ protected void onInputReady(final NHttpServerIOTarget conn) {
conn.consumeInput(this.handler);
- }
+ }
- @Override
- protected void onOutputReady(final NHttpServerIOTarget conn) {
+ @Override
+ protected void onOutputReady(final NHttpServerIOTarget conn) {
conn.produceOutput(this.handler);
- }
+ }
- @Override
- protected void onTimeout(final NHttpServerIOTarget conn) {
+ @Override
+ protected void onTimeout(final NHttpServerIOTarget conn) {
this.handler.timeout(conn);
- }
+ }
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java Sat Sep 3 15:22:00 2011
@@ -71,10 +71,10 @@ public class BasicNIOConnFactory impleme
final NHttpConnectionFactory<? extends NHttpClientConnection> sslFactory) {
super();
if (plainFactory == null) {
- throw new IllegalArgumentException("Plain HTTP client connection factory may not be null");
+ throw new IllegalArgumentException("Plain HTTP client connection factory may not be null");
}
if (sslFactory == null) {
- throw new IllegalArgumentException("SSL HTTP client connection factory may not be null");
+ throw new IllegalArgumentException("SSL HTTP client connection factory may not be null");
}
this.plainFactory = plainFactory;
this.sslFactory = sslFactory;
@@ -105,11 +105,11 @@ public class BasicNIOConnFactory impleme
}
public NHttpClientConnection create(final HttpHost route, final IOSession session) throws IOException {
- NHttpClientConnection conn;
- if (route.getSchemeName().equalsIgnoreCase("https")) {
- conn = this.sslFactory.createConnection(session);
+ NHttpClientConnection conn;
+ if (route.getSchemeName().equalsIgnoreCase("https")) {
+ conn = this.sslFactory.createConnection(session);
} else {
- conn = this.plainFactory.createConnection(session);
+ conn = this.plainFactory.createConnection(session);
}
session.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
return conn;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java Sat Sep 3 15:22:00 2011
@@ -132,11 +132,11 @@ public class SSLClientIOEventDispatch ex
}
protected NHttpClientIOTarget createSSLConnection(final SSLIOSession ssliosession) {
- return super.createConnection(ssliosession);
+ return super.createConnection(ssliosession);
}
@Override
- protected NHttpClientIOTarget createConnection(final IOSession session) {
+ protected NHttpClientIOTarget createConnection(final IOSession session) {
SSLIOSession ssliosession = createSSLIOSession(session, this.sslcontext, this.sslHandler);
session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
NHttpClientIOTarget conn = createSSLConnection(ssliosession);
@@ -146,10 +146,10 @@ public class SSLClientIOEventDispatch ex
this.handler.exception(conn, ex);
ssliosession.shutdown();
}
- return conn;
- }
+ return conn;
+ }
- @Override
+ @Override
public void onConnected(final NHttpClientIOTarget conn) {
int timeout = HttpConnectionParams.getSoTimeout(this.params);
conn.setSocketTimeout(timeout);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java Sat Sep 3 15:22:00 2011
@@ -132,24 +132,24 @@ public class SSLServerIOEventDispatch ex
}
protected NHttpServerIOTarget createSSLConnection(final SSLIOSession ssliosession) {
- return super.createConnection(ssliosession);
+ return super.createConnection(ssliosession);
}
@Override
- protected NHttpServerIOTarget createConnection(final IOSession session) {
+ protected NHttpServerIOTarget createConnection(final IOSession session) {
SSLIOSession ssliosession = createSSLIOSession(session, this.sslcontext, this.sslHandler);
session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
- NHttpServerIOTarget conn = createSSLConnection(ssliosession);
+ NHttpServerIOTarget conn = createSSLConnection(ssliosession);
try {
ssliosession.initialize();
} catch (SSLException ex) {
this.handler.exception(conn, ex);
ssliosession.shutdown();
}
- return conn;
- }
+ return conn;
+ }
- @Override
+ @Override
public void onConnected(final NHttpServerIOTarget conn) {
int timeout = HttpConnectionParams.getSoTimeout(this.params);
conn.setSocketTimeout(timeout);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpConnectionFactory.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpConnectionFactory.java Sat Sep 3 15:22:00 2011
@@ -34,6 +34,6 @@ import org.apache.http.nio.reactor.IOSes
*/
public interface NHttpConnectionFactory<T extends NHttpConnection> {
- T createConnection(IOSession session);
+ T createConnection(IOSession session);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java Sat Sep 3 15:22:00 2011
@@ -79,4 +79,4 @@ class ErrorResponseProducer implements H
this.entity.finish();
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/MessageState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/MessageState.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/MessageState.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/MessageState.java Sat Sep 3 15:22:00 2011
@@ -30,4 +30,4 @@ enum MessageState {
READY, HEAD, ACK, BODY_STREAM, COMPLETED
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java Sat Sep 3 15:22:00 2011
@@ -81,4 +81,4 @@ class NullRequestConsumer implements Htt
return this.completed;
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java Sat Sep 3 15:22:00 2011
@@ -161,38 +161,38 @@ public class SSLIOSession implements IOS
// sun.security.pkcs11.wrapper.PKCS11Exception is re-thrown as
// plain RuntimeException in sun.security.ssl.Handshaker#checkThrown
private SSLException convert(final RuntimeException ex) throws SSLException {
- Throwable cause = ex.getCause();
- if (cause == null) {
- cause = ex;
- }
- return new SSLException(cause);
+ Throwable cause = ex.getCause();
+ if (cause == null) {
+ cause = ex;
+ }
+ return new SSLException(cause);
}
private SSLEngineResult doWrap(final ByteBuffer src, final ByteBuffer dst) throws SSLException {
- try {
- return this.sslEngine.wrap(src, dst);
- } catch (RuntimeException ex) {
- throw convert(ex);
- }
+ try {
+ return this.sslEngine.wrap(src, dst);
+ } catch (RuntimeException ex) {
+ throw convert(ex);
+ }
}
private SSLEngineResult doUnwrap(final ByteBuffer src, final ByteBuffer dst) throws SSLException {
- try {
- return this.sslEngine.unwrap(src, dst);
- } catch (RuntimeException ex) {
- throw convert(ex);
- }
+ try {
+ return this.sslEngine.unwrap(src, dst);
+ } catch (RuntimeException ex) {
+ throw convert(ex);
+ }
}
private void doRunTask() throws SSLException {
- try {
+ try {
Runnable r = this.sslEngine.getDelegatedTask();
if (r != null) {
- r.run();
+ r.run();
}
- } catch (RuntimeException ex) {
- throw convert(ex);
- }
+ } catch (RuntimeException ex) {
+ throw convert(ex);
+ }
}
private void doHandshake() throws SSLException {
@@ -220,7 +220,7 @@ public class SSLIOSession implements IOS
}
break;
case NEED_TASK:
- doRunTask();
+ doRunTask();
break;
case NOT_HANDSHAKING:
handshaking = false;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingIOSession.java Sat Sep 3 15:22:00 2011
@@ -231,4 +231,4 @@ public class LoggingIOSession implements
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpClientConnection.java Sat Sep 3 15:22:00 2011
@@ -193,4 +193,4 @@ public class LoggingNHttpClientConnectio
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/LoggingNHttpServerConnection.java Sat Sep 3 15:22:00 2011
@@ -193,4 +193,4 @@ public class LoggingNHttpServerConnectio
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ContentType.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ContentType.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ContentType.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ContentType.java Sat Sep 3 15:22:00 2011
@@ -52,29 +52,29 @@ public final class ContentType {
// constants
public static final ContentType APPLICATION_ATOM_XML = new ContentType(
- "application/atom+xml", HTTP.DEFAULT_CONTENT_CHARSET);
+ "application/atom+xml", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType APPLICATION_FORM_URLENCODED = new ContentType(
- "application/x-www-form-urlencoded", HTTP.DEFAULT_CONTENT_CHARSET);
+ "application/x-www-form-urlencoded", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType APPLICATION_JSON = new ContentType(
- "application/json", HTTP.DEFAULT_CONTENT_CHARSET);
+ "application/json", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType APPLICATION_OCTET_STREAM = new ContentType(
- "application/octet-stream", null);
+ "application/octet-stream", null);
public static final ContentType APPLICATION_SVG_XML = new ContentType(
- "application/svg+xml", HTTP.DEFAULT_CONTENT_CHARSET);
+ "application/svg+xml", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType APPLICATION_XHTML_XML = new ContentType(
- "application/xhtml+xml", HTTP.DEFAULT_CONTENT_CHARSET);
+ "application/xhtml+xml", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType APPLICATION_XML = new ContentType(
- "application/xml", HTTP.DEFAULT_CONTENT_CHARSET);
+ "application/xml", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType MULTIPART_FORM_DATA = new ContentType(
- "multipart/form-data", HTTP.DEFAULT_CONTENT_CHARSET);
+ "multipart/form-data", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType TEXT_HTML = new ContentType(
- "text/html", HTTP.DEFAULT_CONTENT_CHARSET);
+ "text/html", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType TEXT_PLAIN = new ContentType(
- "text/plain", HTTP.DEFAULT_CONTENT_CHARSET);
+ "text/plain", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType TEXT_XML = new ContentType(
- "text/xml", HTTP.DEFAULT_CONTENT_CHARSET);
+ "text/xml", HTTP.DEFAULT_CONTENT_CHARSET);
public static final ContentType WILDCARD = new ContentType(
- "*/*", null);
+ "*/*", null);
// defaults
public static final ContentType DEFAULT_TEXT = TEXT_PLAIN;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java Sat Sep 3 15:22:00 2011
@@ -56,7 +56,7 @@ public class ResponseContent implements
/**
* Default constructor. The <code>Content-Length</code> or <code>Transfer-Encoding</code>
- * will cause the interceptor to throw {@link ProtocolException} if already present in the
+ * will cause the interceptor to throw {@link ProtocolException} if already present in the
* response message.
*/
public ResponseContent() {
@@ -65,11 +65,11 @@ public class ResponseContent implements
/**
* Constructor that can be used to fine-tune behavior of this interceptor.
- *
- * @param overwrite If set to <code>true</code> the <code>Content-Length</code> and
+ *
+ * @param overwrite If set to <code>true</code> the <code>Content-Length</code> and
* <code>Transfer-Encoding</code> headers will be created or updated if already present.
- * If set to <code>false</code> the <code>Content-Length</code> and
- * <code>Transfer-Encoding</code> headers will cause the interceptor to throw
+ * If set to <code>false</code> the <code>Content-Length</code> and
+ * <code>Transfer-Encoding</code> headers will cause the interceptor to throw
* {@link ProtocolException} if already present in the response message.
*/
public ResponseContent(boolean overwrite) {
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/BasicFutureCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/BasicFutureCallback.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/BasicFutureCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/BasicFutureCallback.java Sat Sep 3 15:22:00 2011
@@ -69,4 +69,4 @@ class BasicFutureCallback<T> implements
return this.cancelled;
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java Sat Sep 3 15:22:00 2011
@@ -41,4 +41,4 @@ class DummyHttpMessage extends AbstractH
return HttpProtocolParams.getVersion(this.getParams());
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestSocketOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestSocketOutputBuffer.java?rev=1164871&r1=1164870&r2=1164871&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestSocketOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestSocketOutputBuffer.java Sat Sep 3 15:22:00 2011
@@ -46,9 +46,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
public class TestSocketOutputBuffer {
-
+
private SocketOutputBuffer sob;
-
+
@Mock private Socket socket;
@Mock private OutputStream os;
@Mock private HttpParams params;
@@ -58,19 +58,19 @@ public class TestSocketOutputBuffer {
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
-
+
when(socket.getOutputStream()).thenReturn(os);
}
private void create(int buffSize, int arraySize, int minChunkLimit) throws Exception {
b = new byte[arraySize];
cb = new CharArrayBuffer(arraySize);
-
+
when(params.getIntParameter(CoreConnectionPNames.MIN_CHUNK_LIMIT, 512)).thenReturn(minChunkLimit);
-
+
sob = new SocketOutputBuffer(socket, buffSize, params);
}
-
+
@Test
public void testWriteByteArrayOffLenDirectToStream1() throws Exception {
create(2048, 2048, 1024);
@@ -122,7 +122,7 @@ public class TestSocketOutputBuffer {
@Test
public void testWriteLineString() throws Exception {
create(2048, 2048, 2048);
-
+
sob.writeLine("test");
}
@@ -130,14 +130,14 @@ public class TestSocketOutputBuffer {
public void testWriteLineStringEncode() throws Exception {
when(params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET)).thenReturn("UTF-8");
create(2048, 2048, 2048);
-
+
sob.writeLine("test");
}
@Test
public void testWriteLineEmptyString() throws Exception {
create(2048, 2048, 2048);
-
+
sob.writeLine("");
}
@@ -145,14 +145,14 @@ public class TestSocketOutputBuffer {
public void testWriteLineEmptyStringEncode() throws Exception {
when(params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET)).thenReturn("UTF-8");
create(2048, 2048, 2048);
-
+
sob.writeLine("");
}
@Test
public void testWriteLineNullString() throws Exception {
create(2048, 2048, 2048);
-
+
sob.writeLine((String)null);
}
@@ -160,14 +160,14 @@ public class TestSocketOutputBuffer {
public void testWriteLineNullStringEncode() throws Exception {
when(params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET)).thenReturn("UTF-8");
create(2048, 2048, 2048);
-
+
sob.writeLine((String)null);
}
@Test
public void testWriteLineCharArrayBuffer() throws Exception {
create(2048, 2048, 2048);
-
+
sob.writeLine(cb);
}
@@ -175,14 +175,14 @@ public class TestSocketOutputBuffer {
public void testWriteLineCharArrayBufferEncode() throws Exception {
when(params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET)).thenReturn("UTF-8");
create(2048, 2048, 2048);
-
+
sob.writeLine(cb);
}
@Test
public void testWriteLineEmptyCharArrayBuffer() throws Exception {
create(2048, 0, 2048);
-
+
sob.writeLine(cb);
}
@@ -190,7 +190,7 @@ public class TestSocketOutputBuffer {
public void testWriteLineEmptyCharArrayBufferEncode() throws Exception {
when(params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET)).thenReturn("UTF-8");
create(2048, 0, 2048);
-
+
sob.writeLine(cb);
}