You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/16 04:21:08 UTC
svn commit: r1433814 - in /httpcomponents:
contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/
httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/
Author: ggregory
Date: Wed Jan 16 03:21:08 2013
New Revision: 1433814
URL: http://svn.apache.org/viewvc?rev=1433814&view=rev
Log:
Fix: replace tabs with spaces.
Modified:
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java
httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java?rev=1433814&r1=1433813&r2=1433814&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java Wed Jan 16 03:21:08 2013
@@ -81,8 +81,8 @@ public class BasicCompactHeader extends
CompactHeaderMapper mapper) {
Args.notNull(name, "Name");
if (mapper == null) {
- mapper = BasicCompactHeaderMapper.DEFAULT;
- }
+ mapper = BasicCompactHeaderMapper.DEFAULT;
+ }
final String altname = mapper.getAlternateName(name);
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java?rev=1433814&r1=1433813&r2=1433814&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java Wed Jan 16 03:21:08 2013
@@ -105,7 +105,7 @@ public class BasicCompactHeaderMapper im
Args.notNull(compact, "Compact name");
Args.notNull(full, "Full name");
Args.check(compact.length() < full.length(), "The compact name must be shorter " +
- "than the full name. " + compact + " -> " + full);
+ "than the full name. " + compact + " -> " + full);
mapCompactToFull.put(compact.toLowerCase(), full);
mapFullToCompact.put(full.toLowerCase(), compact);
}
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java?rev=1433814&r1=1433813&r2=1433814&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java Wed Jan 16 03:21:08 2013
@@ -91,8 +91,8 @@ public class BufferedCompactHeader
}
if (mapper == null) {
- mapper = BasicCompactHeaderMapper.DEFAULT;
- }
+ mapper = BasicCompactHeaderMapper.DEFAULT;
+ }
final String altname = mapper.getAlternateName(name);
String fname = name;
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java?rev=1433814&r1=1433813&r2=1433814&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java Wed Jan 16 03:21:08 2013
@@ -556,8 +556,8 @@ public class CachingHttpAsyncClient impl
long age = this.validityPolicy.getCurrentAgeSecs(entry, now);
long lifetime = this.validityPolicy.getFreshnessLifetimeSecs(entry);
if (age - lifetime > maxstale) {
- return true;
- }
+ return true;
+ }
} catch (NumberFormatException nfe) {
return true;
}
@@ -617,16 +617,16 @@ public class CachingHttpAsyncClient impl
RequestLine line = request.getRequestLine();
if (!HeaderConstants.OPTIONS_METHOD.equals(line.getMethod())) {
- return false;
- }
+ return false;
+ }
if (!"*".equals(line.getUri())) {
- return false;
- }
+ return false;
+ }
if (!"0".equals(request.getFirstHeader(HeaderConstants.MAX_FORWARDS).getValue())) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -668,8 +668,8 @@ public class CachingHttpAsyncClient impl
Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
Date respDate = DateUtils.parseDate(responseDateHeader.getValue());
if (respDate.before(entryDate)) {
- return true;
- }
+ return true;
+ }
} catch (DateParseException e) {
// either backend response or cached entry did not have a valid
// Date header, so we can't tell if they are out of order
@@ -980,16 +980,16 @@ public class CachingHttpAsyncClient impl
// nop
}
if (existing == null) {
- return false;
- }
+ return false;
+ }
Header entryDateHeader = existing.getFirstHeader("Date");
if (entryDateHeader == null) {
- return false;
- }
+ return false;
+ }
Header responseDateHeader = backendResponse.getFirstHeader("Date");
if (responseDateHeader == null) {
- return false;
- }
+ return false;
+ }
try {
Date entryDate = DateUtils.parseDate(entryDateHeader.getValue());
Date responseDate = DateUtils.parseDate(responseDateHeader.getValue());