From aa9922355824a278e05fc3f0bbdd485faa547061 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Mon, 19 Dec 2011 17:56:55 -0800
Subject: [PATCH] permit NPE on cdn metadata while in beta

---
 .../storage/blobstore/functions/PublicUriForObjectInfo.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/PublicUriForObjectInfo.java b/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/PublicUriForObjectInfo.java
index 7492adcd8d..2291495664 100644
--- a/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/PublicUriForObjectInfo.java
+++ b/providers/hpcloud-object-storage/src/main/java/org/jclouds/hpcloud/object/storage/blobstore/functions/PublicUriForObjectInfo.java
@@ -54,6 +54,10 @@ public class PublicUriForObjectInfo implements Function<ObjectInfo, URI> {
       } catch (CacheLoader.InvalidCacheLoadException e) {
          // nulls not permitted from cache loader
          return null;
+      } catch (NullPointerException e) {
+         // nulls not permitted from cache loader
+         // TODO this shouldn't occur when the above exception is reliably presented
+         return null;
       }
    }
 }
\ No newline at end of file