Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1152: Also apply type check before byte[] cast on memcached retrieval. 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1229203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Moore 2012-01-09 15:27:04 +00:00
parent ae11627878
commit e78b50d6de
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java vendored
View File

@ -127,13 +127,25 @@ public class MemcachedHttpCacheStorage implements HttpCacheStorage {
client.set(url, 0, bos.toByteArray());
}
public HttpCacheEntry getEntry(String url) throws IOException {
byte[] data = (byte[]) client.get(url);
if (null == data)
private byte[] convertToByteArray(Object o) {
if (o == null) return null;
if (!(o instanceof byte[])) {
log.warn("got a non-bytearray back from memcached: " + o);
return null;
InputStream bis = new ByteArrayInputStream(data);
}
return (byte[])o;
}
private HttpCacheEntry reconstituteEntry(Object o) throws IOException {
byte[] out = convertToByteArray(o);
if (out == null) return null;
InputStream bis = new ByteArrayInputStream(out);
return serializer.readFrom(bis);
}
public HttpCacheEntry getEntry(String url) throws IOException {
return reconstituteEntry(client.get(url));
}
public void removeEntry(String url) throws IOException {
client.delete(url);
@ -145,19 +157,8 @@ public class MemcachedHttpCacheStorage implements HttpCacheStorage {
do {
CASValue<Object> v = client.gets(url);
byte[] oldBytes = null;
if (v != null) {
if (v.getValue() instanceof byte[]) {
oldBytes = (byte[])v.getValue();
} else {
log.warn("got non-bytearray back from memcached");
}
}
HttpCacheEntry existingEntry = null;
if (oldBytes != null) {
ByteArrayInputStream bis = new ByteArrayInputStream(oldBytes);
existingEntry = serializer.readFrom(bis);
}
HttpCacheEntry existingEntry = (v == null) ? null
: reconstituteEntry(v.getValue());
HttpCacheEntry updatedEntry = callback.update(existingEntry);
if (v == null) {