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

Merge pull request #929 from andrewgaul/hpcloud-clearcontainer-1.5.x 

Work around failed CDN metadata lookups with HPCS
This commit is contained in:
Adrian Cole 2012-10-29 21:02:36 -07:00
parent f58442eea1 0b2902c5e0
commit 2beb5cf7f7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/functions/PublicUriForObjectInfo.java
View File

@ -18,7 +18,10 @@
*/ */
package org.jclouds.hpcloud.objectstorage.blobstore.functions; package org.jclouds.hpcloud.objectstorage.blobstore.functions;
import static com.google.common.base.Throwables.propagate;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Provider; import javax.inject.Provider;
@ -45,14 +48,24 @@ public class PublicUriForObjectInfo implements Function<ObjectInfo, URI> {
this.uriBuilders = uriBuilders; this.uriBuilders = uriBuilders;
} }
private static final URI NEGATIVE_ENTRY = URI.create("http://127.0.0.1");
public URI apply(ObjectInfo from) { public URI apply(ObjectInfo from) {
if (from == null) if (from == null)
return null; return null;
try { try {
return uriBuilders.get().uri(cdnContainer.getUnchecked(from.getContainer())).path(from.getName()).replaceQuery("") URI uri = cdnContainer.getUnchecked(from.getContainer());
if (uri == NEGATIVE_ENTRY) { // intentionally use reference equality
// TODO: GetCDNMetadata.load returns null on failure cases. We use
// a negative entry to avoid repeatedly issuing failed CDN queries.
// The LoadingCache removes this value after its normal expiry.
return null;
}
return uriBuilders.get().uri(uri).path(from.getName()).replaceQuery("")
.build(); .build();
} catch (CacheLoader.InvalidCacheLoadException e) { } catch (CacheLoader.InvalidCacheLoadException e) {
// nulls not permitted from cache loader // nulls not permitted from cache loader
cdnContainer.put(from.getContainer(), NEGATIVE_ENTRY);
return null; return null;
} catch (NullPointerException e) { } catch (NullPointerException e) {
// nulls not permitted from cache loader // nulls not permitted from cache loader