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/11/08 10:42:56 UTC
svn commit: r1199167 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/main/java/org/apache/http/nio/entity/
httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/
httpcore-nio/src/test/java/org/apache/http/nio/protocol/
httpcore/src/main/jav...
Author: olegk
Date: Tue Nov 8 09:42:55 2011
New Revision: 1199167
URL: http://svn.apache.org/viewvc?rev=1199167&view=rev
Log:
TABS -> SPACES
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpAsyncContentProducer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java Tue Nov 8 09:42:55 2011
@@ -48,7 +48,7 @@ import org.apache.http.nio.util.SimpleIn
* {@link HttpEntity#writeTo(OutputStream)}.
*
* @since 4.0
- *
+ *
* @deprecated use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
*/
@NotThreadSafe
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java Tue Nov 8 09:42:55 2011
@@ -40,7 +40,7 @@ import org.apache.http.nio.protocol.Basi
* {@link ContentDecoder}.
*
* @since 4.0
- *
+ *
* @deprecated use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
*/
@Deprecated
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java Tue Nov 8 09:42:55 2011
@@ -43,7 +43,7 @@ import org.apache.http.nio.protocol.Basi
* {@link ContentListener}.
*
* @since 4.0
- *
+ *
* @deprecated use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
*/
@Deprecated
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java Tue Nov 8 09:42:55 2011
@@ -51,7 +51,7 @@ public class ContentInputStream extends
}
this.buffer = buffer;
}
-
+
@Override
public int available() throws IOException {
if (this.buffer instanceof BufferInfo) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpAsyncContentProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpAsyncContentProducer.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpAsyncContentProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpAsyncContentProducer.java Tue Nov 8 09:42:55 2011
@@ -51,7 +51,7 @@ public interface HttpAsyncContentProduce
* @param ioctrl I/O control of the underlying connection.
*/
void produceContent(ContentEncoder encoder, IOControl ioctrl) throws IOException;
-
+
boolean isRepeatable();
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java Tue Nov 8 09:42:55 2011
@@ -47,7 +47,7 @@ import org.apache.http.nio.IOControl;
*/
@SuppressWarnings("deprecation")
@NotThreadSafe
-public class NByteArrayEntity extends AbstractHttpEntity
+public class NByteArrayEntity extends AbstractHttpEntity
implements HttpAsyncContentProducer, ProducingNHttpEntity {
private final byte[] b;
@@ -110,7 +110,7 @@ public class NByteArrayEntity extends Ab
/**
* {@inheritDoc}
- *
+ *
* @since 4.2
*/
public void close() {
@@ -119,7 +119,7 @@ public class NByteArrayEntity extends Ab
/**
* {@inheritDoc}
- *
+ *
* @deprecated use {@link #close()}
*/
public void finish() {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java Tue Nov 8 09:42:55 2011
@@ -52,7 +52,7 @@ import org.apache.http.nio.IOControl;
*/
@SuppressWarnings("deprecation")
@NotThreadSafe
-public class NFileEntity extends AbstractHttpEntity
+public class NFileEntity extends AbstractHttpEntity
implements HttpAsyncContentProducer, ProducingNHttpEntity {
private final File file;
@@ -129,7 +129,7 @@ public class NFileEntity extends Abstrac
/**
* {@inheritDoc}
- *
+ *
* @since 4.2
*/
public void close() throws IOException {
@@ -142,7 +142,7 @@ public class NFileEntity extends Abstrac
/**
* {@inheritDoc}
- *
+ *
* @deprecated use {@link #close()}
*/
public void finish() throws IOException {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java Tue Nov 8 09:42:55 2011
@@ -45,7 +45,7 @@ import org.apache.http.nio.IOControl;
* entities.
*
* @since 4.0
- *
+ *
* @deprecated use {@link EntityAsyncContentProducer}
*/
@NotThreadSafe
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java Tue Nov 8 09:42:55 2011
@@ -185,7 +185,7 @@ public class NStringEntity extends Abstr
/**
* {@inheritDoc}
- *
+ *
* @since 4.2
*/
public void close() {
@@ -194,7 +194,7 @@ public class NStringEntity extends Abstr
/**
* {@inheritDoc}
- *
+ *
* @deprecated use {@link #close()}
*/
public void finish() {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java Tue Nov 8 09:42:55 2011
@@ -40,7 +40,7 @@ import org.apache.http.nio.protocol.Basi
* {@link ContentEncoder}.
*
* @since 4.0
- *
+ *
* @deprecated use {@link BasicAsyncRequestProducer} or {@link BasicAsyncResponseProducer}
*/
@Deprecated
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java Tue Nov 8 09:42:55 2011
@@ -173,7 +173,7 @@ public class TestDefaultIOReactors exten
openClientConns.await(15, TimeUnit.SECONDS);
openServerConns.await(15, TimeUnit.SECONDS);
-
+
this.connpool.shutdown(2000);
this.client.shutdown();
this.server.shutdown();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncClientExchangeHandlerImpl.java Tue Nov 8 09:42:55 2011
@@ -417,4 +417,4 @@ public class TestHttpAsyncClientExchange
Assert.assertSame(this.reuseStrategy, this.exchangeHandler.getConnectionReuseStrategy());
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncRequestExecutor.java Tue Nov 8 09:42:55 2011
@@ -335,4 +335,4 @@ public class TestHttpAsyncRequestExecuto
Mockito.verify(this.connPool).release(entry, false);
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java?rev=1199167&r1=1199166&r2=1199167&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java Tue Nov 8 09:42:55 2011
@@ -58,7 +58,7 @@ public class EntityTemplate extends Abst
public InputStream getContent() throws IOException {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
writeTo(buf);
- return new ByteArrayInputStream(buf.toByteArray());
+ return new ByteArrayInputStream(buf.toByteArray());
}
public boolean isRepeatable() {