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 2012/12/19 10:45:51 UTC
svn commit: r1423806 - in
/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache:
CacheEntryUpdater.java ResourceReference.java
Author: olegk
Date: Wed Dec 19 09:45:50 2012
New Revision: 1423806
URL: http://svn.apache.org/viewvc?rev=1423806&view=rev
Log:
Use Asserts to verify object state (follow-up)
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java?rev=1423806&r1=1423805&r2=1423806&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java Wed Dec 19 09:45:50 2012
@@ -44,6 +44,7 @@ import org.apache.http.client.cache.Reso
import org.apache.http.impl.cookie.DateParseException;
import org.apache.http.impl.cookie.DateUtils;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.Args;
/**
* Update a {@link HttpCacheEntry} with new or updated information based on the latest
@@ -84,8 +85,8 @@ class CacheEntryUpdater {
Date requestDate,
Date responseDate,
HttpResponse response) throws IOException {
- if (response.getStatusLine().getStatusCode() != HttpStatus.SC_NOT_MODIFIED)
- throw new IllegalArgumentException("Response must have 304 status code");
+ Args.check(response.getStatusLine().getStatusCode() == HttpStatus.SC_NOT_MODIFIED,
+ "Response must have 304 status code");
Header[] mergedHeaders = mergeHeaders(entry, response);
Resource oldResource = entry.getResource();
Resource resource = null;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java?rev=1423806&r1=1423805&r2=1423806&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResourceReference.java Wed Dec 19 09:45:50 2012
@@ -32,6 +32,7 @@ import java.lang.ref.ReferenceQueue;
import org.apache.http.annotation.Immutable;
import org.apache.http.client.cache.HttpCacheEntry;
import org.apache.http.client.cache.Resource;
+import org.apache.http.util.Args;
@Immutable
class ResourceReference extends PhantomReference<HttpCacheEntry> {
@@ -40,9 +41,7 @@ class ResourceReference extends PhantomR
public ResourceReference(final HttpCacheEntry entry, final ReferenceQueue<HttpCacheEntry> q) {
super(entry, q);
- if (entry.getResource() == null) {
- throw new IllegalArgumentException("Resource may not be null");
- }
+ Args.notNull(entry.getResource(), "Resource");
this.resource = entry.getResource();
}