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 2013/01/15 23:20:08 UTC
svn commit: r1433704 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/
httpcore/src/main/java/org/apache/http/
httpcore/src/main/java/org/apache/http/impl/
httpcore/src/main/java/org/apache/http/impl/io/ h...
Author: olegk
Date: Tue Jan 15 22:20:08 2013
New Revision: 1433704
URL: http://svn.apache.org/viewvc?rev=1433704&view=rev
Log:
Fixed style check violations (tabs introduced by a previous commit)
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpHost.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java Tue Jan 15 22:20:08 2013
@@ -252,8 +252,8 @@ public class TestIdentityDecoder {
long pos = beginning.length;
while (!decoder.isCompleted()) {
if(testfile.length() < pos) {
- testfile.setLength(pos);
- }
+ testfile.setLength(pos);
+ }
long bytesRead = decoder.transfer(fchannel, pos, 10);
if (bytesRead > 0) {
pos += bytesRead;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java Tue Jan 15 22:20:08 2013
@@ -368,8 +368,8 @@ public class TestLengthDelimitedDecoder
long pos = beginning.length;
while (!decoder.isCompleted()) {
if(testfile.length() < pos) {
- testfile.setLength(pos);
- }
+ testfile.setLength(pos);
+ }
long bytesRead = decoder.transfer(fchannel, pos, 10);
if (bytesRead > 0) {
pos += bytesRead;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpHost.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpHost.java Tue Jan 15 22:20:08 2013
@@ -188,8 +188,8 @@ public final class HttpHost implements C
@Override
public boolean equals(final Object obj) {
if (this == obj) {
- return true;
- }
+ return true;
+ }
if (obj instanceof HttpHost) {
HttpHost that = (HttpHost) obj;
return this.lcHostname.equals(that.lcHostname)
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java Tue Jan 15 22:20:08 2013
@@ -108,8 +108,8 @@ public class DefaultConnectionReuseStrat
// broken but unfortunately common extension of HTTP.
HeaderIterator hit = response.headerIterator(HTTP.CONN_DIRECTIVE);
if (!hit.hasNext()) {
- hit = response.headerIterator("Proxy-Connection");
- }
+ hit = response.headerIterator("Proxy-Connection");
+ }
// Experimental usage of the "Connection" header in HTTP/1.0 is
// documented in RFC 2068, section 19.7.1. A token "keep-alive" is
@@ -148,10 +148,10 @@ public class DefaultConnectionReuseStrat
}
}
if (keepalive)
- {
- return true;
+ {
+ return true;
// neither "close" nor "keep-alive", use default policy
- }
+ }
} catch (ParseException px) {
// invalid connection header means no persistent connection
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java Tue Jan 15 22:20:08 2013
@@ -79,8 +79,8 @@ public class EnglishReasonPhraseCatalog
String reason = null;
if (REASON_PHRASES[category].length > subcode) {
- reason = REASON_PHRASES[category][subcode];
- }
+ reason = REASON_PHRASES[category][subcode];
+ }
return reason;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java Tue Jan 15 22:20:08 2013
@@ -155,8 +155,8 @@ public class ChunkedOutputStream extends
this.cache[this.cachePosition] = (byte) b;
this.cachePosition++;
if (this.cachePosition == this.cache.length) {
- flushCache();
- }
+ flushCache();
+ }
}
/**
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java Tue Jan 15 22:20:08 2013
@@ -113,8 +113,8 @@ public class BasicHeaderElement implemen
@Override
public boolean equals(final Object object) {
if (this == object) {
- return true;
- }
+ return true;
+ }
if (object instanceof HeaderElement) {
BasicHeaderElement that = (BasicHeaderElement) object;
return this.name.equals(that.name)
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java Tue Jan 15 22:20:08 2013
@@ -92,8 +92,8 @@ public class BasicHeaderIterator impleme
*/
protected int findNext(int from) {
if (from < -1) {
- return -1;
- }
+ return -1;
+ }
final int to = this.allHeaders.length-1;
boolean found = false;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java Tue Jan 15 22:20:08 2013
@@ -90,8 +90,8 @@ public class BasicHeaderValueFormatter i
final boolean quote,
HeaderValueFormatter formatter) {
if (formatter == null) {
- formatter = BasicHeaderValueFormatter.INSTANCE;
- }
+ formatter = BasicHeaderValueFormatter.INSTANCE;
+ }
return formatter.formatElements(null, elems, quote).toString();
}
@@ -128,8 +128,8 @@ public class BasicHeaderValueFormatter i
*/
protected int estimateElementsLen(final HeaderElement[] elems) {
if ((elems == null) || (elems.length < 1)) {
- return 0;
- }
+ return 0;
+ }
int result = (elems.length-1) * 2; // elements separated by ", "
for (HeaderElement elem : elems) {
@@ -157,8 +157,8 @@ public class BasicHeaderValueFormatter i
final boolean quote,
HeaderValueFormatter formatter) {
if (formatter == null) {
- formatter = BasicHeaderValueFormatter.INSTANCE;
- }
+ formatter = BasicHeaderValueFormatter.INSTANCE;
+ }
return formatter.formatHeaderElement(null, elem, quote).toString();
}
@@ -203,8 +203,8 @@ public class BasicHeaderValueFormatter i
*/
protected int estimateHeaderElementLen(final HeaderElement elem) {
if (elem == null) {
- return 0;
- }
+ return 0;
+ }
int result = elem.getName().length(); // name
final String value = elem.getValue();
@@ -243,8 +243,8 @@ public class BasicHeaderValueFormatter i
final boolean quote,
HeaderValueFormatter formatter) {
if (formatter == null) {
- formatter = BasicHeaderValueFormatter.INSTANCE;
- }
+ formatter = BasicHeaderValueFormatter.INSTANCE;
+ }
return formatter.formatParameters(null, nvps, quote).toString();
}
@@ -281,8 +281,8 @@ public class BasicHeaderValueFormatter i
*/
protected int estimateParametersLen(final NameValuePair[] nvps) {
if ((nvps == null) || (nvps.length < 1)) {
- return 0;
- }
+ return 0;
+ }
int result = (nvps.length-1) * 2; // "; " between the parameters
for (NameValuePair nvp : nvps) {
@@ -309,8 +309,8 @@ public class BasicHeaderValueFormatter i
final boolean quote,
HeaderValueFormatter formatter) {
if (formatter == null) {
- formatter = BasicHeaderValueFormatter.INSTANCE;
- }
+ formatter = BasicHeaderValueFormatter.INSTANCE;
+ }
return formatter.formatNameValuePair(null, nvp, quote).toString();
}
@@ -347,8 +347,8 @@ public class BasicHeaderValueFormatter i
*/
protected int estimateNameValuePairLen(final NameValuePair nvp) {
if (nvp == null) {
- return 0;
- }
+ return 0;
+ }
int result = nvp.getName().length(); // name
final String value = nvp.getValue();
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java Tue Jan 15 22:20:08 2013
@@ -86,8 +86,8 @@ public class BasicHeaderValueParser impl
HeaderValueParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicHeaderValueParser.INSTANCE;
- }
+ parser = BasicHeaderValueParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
@@ -125,8 +125,8 @@ public class BasicHeaderValueParser impl
HeaderValueParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicHeaderValueParser.INSTANCE;
- }
+ parser = BasicHeaderValueParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
@@ -179,8 +179,8 @@ public class BasicHeaderValueParser impl
HeaderValueParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicHeaderValueParser.INSTANCE;
- }
+ parser = BasicHeaderValueParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
@@ -237,8 +237,8 @@ public class BasicHeaderValueParser impl
HeaderValueParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicHeaderValueParser.INSTANCE;
- }
+ parser = BasicHeaderValueParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java Tue Jan 15 22:20:08 2013
@@ -100,8 +100,8 @@ public class BasicLineFormatter implemen
String formatProtocolVersion(final ProtocolVersion version,
LineFormatter formatter) {
if (formatter == null) {
- formatter = BasicLineFormatter.INSTANCE;
- }
+ formatter = BasicLineFormatter.INSTANCE;
+ }
return formatter.appendProtocolVersion(null, version).toString();
}
@@ -156,8 +156,8 @@ public class BasicLineFormatter implemen
public final static String formatRequestLine(final RequestLine reqline,
LineFormatter formatter) {
if (formatter == null) {
- formatter = BasicLineFormatter.INSTANCE;
- }
+ formatter = BasicLineFormatter.INSTANCE;
+ }
return formatter.formatRequestLine(null, reqline).toString();
}
@@ -213,8 +213,8 @@ public class BasicLineFormatter implemen
public final static String formatStatusLine(final StatusLine statline,
LineFormatter formatter) {
if (formatter == null) {
- formatter = BasicLineFormatter.INSTANCE;
- }
+ formatter = BasicLineFormatter.INSTANCE;
+ }
return formatter.formatStatusLine(null, statline).toString();
}
@@ -272,8 +272,8 @@ public class BasicLineFormatter implemen
public final static String formatHeader(final Header header,
LineFormatter formatter) {
if (formatter == null) {
- formatter = BasicLineFormatter.INSTANCE;
- }
+ formatter = BasicLineFormatter.INSTANCE;
+ }
return formatter.formatHeader(null, header).toString();
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java Tue Jan 15 22:20:08 2013
@@ -107,8 +107,8 @@ public class BasicLineParser implements
LineParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicLineParser.INSTANCE;
- }
+ parser = BasicLineParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
@@ -217,9 +217,9 @@ public class BasicLineParser implements
final int protolength = protoname.length();
if (buffer.length() < protolength+4)
- {
- return false; // not long enough for "HTTP/1.1"
- }
+ {
+ return false; // not long enough for "HTTP/1.1"
+ }
if (index < 0) {
// end of line, no tolerance for trailing whitespace
@@ -235,8 +235,8 @@ public class BasicLineParser implements
if (index + protolength + 4 > buffer.length()) {
- return false;
- }
+ return false;
+ }
// just check protocol name and slash, no need to analyse the version
@@ -258,8 +258,8 @@ public class BasicLineParser implements
LineParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicLineParser.INSTANCE;
- }
+ parser = BasicLineParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
@@ -347,8 +347,8 @@ public class BasicLineParser implements
LineParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicLineParser.INSTANCE;
- }
+ parser = BasicLineParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
@@ -433,8 +433,8 @@ public class BasicLineParser implements
LineParser parser) throws ParseException {
Args.notNull(value, "Value");
if (parser == null) {
- parser = BasicLineParser.INSTANCE;
- }
+ parser = BasicLineParser.INSTANCE;
+ }
CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java Tue Jan 15 22:20:08 2013
@@ -101,8 +101,8 @@ public class BasicListHeaderIterator imp
*/
protected int findNext(int from) {
if (from < -1) {
- return -1;
- }
+ return -1;
+ }
final int to = this.allHeaders.size()-1;
boolean found = false;
@@ -124,8 +124,8 @@ public class BasicListHeaderIterator imp
*/
protected boolean filterHeader(final int index) {
if (this.headerName == null) {
- return true;
- }
+ return true;
+ }
// non-header elements, including null, will trigger exceptions
final String name = (this.allHeaders.get(index)).getName();
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java Tue Jan 15 22:20:08 2013
@@ -86,8 +86,8 @@ public class BasicNameValuePair implemen
@Override
public boolean equals(final Object object) {
if (this == object) {
- return true;
- }
+ return true;
+ }
if (object instanceof NameValuePair) {
BasicNameValuePair that = (BasicNameValuePair) object;
return this.name.equals(that.name)
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java Tue Jan 15 22:20:08 2013
@@ -373,18 +373,18 @@ public class BasicTokenIterator implemen
// common sense extension of ALPHA + DIGIT
if (Character.isLetterOrDigit(ch)) {
- return true;
- }
+ return true;
+ }
// common sense extension of CTL
if (Character.isISOControl(ch)) {
- return false;
- }
+ return false;
+ }
// no common sense extension for this
if (isHttpSeparator(ch)) {
- return false;
- }
+ return false;
+ }
// RFC 2616, section 2.2 defines a token character as
// "any CHAR except CTLs or separators". The controls
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/RouteSpecificPool.java Tue Jan 15 22:20:08 2013
@@ -145,8 +145,8 @@ abstract class RouteSpecificPool<T, C, E
public void unqueue(final PoolEntryFuture<E> future) {
if (future == null) {
- return;
- }
+ return;
+ }
this.pending.remove(future);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java Tue Jan 15 22:20:08 2013
@@ -116,8 +116,8 @@ public final class BasicHttpProcessor im
public HttpRequestInterceptor getRequestInterceptor(final int index) {
if ((index < 0) || (index >= this.requestInterceptors.size())) {
- return null;
- }
+ return null;
+ }
return this.requestInterceptors.get(index);
}
@@ -146,8 +146,8 @@ public final class BasicHttpProcessor im
public HttpResponseInterceptor getResponseInterceptor(final int index) {
if ((index < 0) || (index >= this.responseInterceptors.size())) {
- return null;
- }
+ return null;
+ }
return this.responseInterceptors.get(index);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java?rev=1433704&r1=1433703&r2=1433704&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java Tue Jan 15 22:20:08 2013
@@ -167,17 +167,17 @@ public class VersionInfo {
// If version info is missing, a single "UNAVAILABLE" for the module
// is sufficient. Everything else just clutters the output.
if (!UNAVAILABLE.equals(infoRelease)) {
- sb.append(':').append(infoRelease);
- }
+ sb.append(':').append(infoRelease);
+ }
if (!UNAVAILABLE.equals(infoTimestamp)) {
- sb.append(':').append(infoTimestamp);
- }
+ sb.append(':').append(infoTimestamp);
+ }
sb.append(')');
if (!UNAVAILABLE.equals(infoClassloader)) {
- sb.append('@').append(infoClassloader);
- }
+ sb.append('@').append(infoClassloader);
+ }
return sb.toString();
}
@@ -200,8 +200,8 @@ public class VersionInfo {
for (String pckg : pckgs) {
VersionInfo vi = loadVersionInfo(pckg, clsldr);
if (vi != null) {
- vil.add(vi);
- }
+ vil.add(vi);
+ }
}
return vil.toArray(new VersionInfo[vil.size()]);
@@ -224,8 +224,8 @@ public class VersionInfo {
ClassLoader clsldr) {
Args.notNull(pckg, "Package identifier");
if (clsldr == null) {
- clsldr = Thread.currentThread().getContextClassLoader();
- }
+ clsldr = Thread.currentThread().getContextClassLoader();
+ }
Properties vip = null; // version info properties, if available
try {
@@ -248,8 +248,8 @@ public class VersionInfo {
VersionInfo result = null;
if (vip != null) {
- result = fromMap(pckg, vip, clsldr);
- }
+ result = fromMap(pckg, vip, clsldr);
+ }
return result;
}
@@ -275,28 +275,28 @@ public class VersionInfo {
if (info != null) {
module = (String) info.get(PROPERTY_MODULE);
if ((module != null) && (module.length() < 1)) {
- module = null;
- }
+ module = null;
+ }
release = (String) info.get(PROPERTY_RELEASE);
if ((release != null) && ((release.length() < 1) ||
(release.equals("${pom.version}")))) {
- release = null;
- }
+ release = null;
+ }
timestamp = (String) info.get(PROPERTY_TIMESTAMP);
if ((timestamp != null) &&
((timestamp.length() < 1) ||
(timestamp.equals("${mvn.timestamp}")))
) {
- timestamp = null;
- }
+ timestamp = null;
+ }
} // if info
String clsldrstr = null;
if (clsldr != null) {
- clsldrstr = clsldr.toString();
- }
+ clsldrstr = clsldr.toString();
+ }
return new VersionInfo(pckg, module, release, timestamp, clsldrstr);
}