From e5c1c45ed29d58c79cad5c1bd7b1eb9f09da22ed Mon Sep 17 00:00:00 2001
From: adriancole <adrian.f.cole@gmail.com>
Date: Mon, 25 Mar 2013 08:28:54 -0700
Subject: [PATCH] it is possible that for access control reasons, templates in
 trmk can be null

---
 .../functions/ImageForVCloudExpressVAppTemplate.java      | 2 ++
 .../compute/functions/ImagesInVCloudExpressOrg.java       | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java
index 4a54d5ba57..dfd68d660d 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java
@@ -61,6 +61,8 @@ public class ImageForVCloudExpressVAppTemplate implements Function<VAppTemplate,
 
    @Override
    public Image apply(VAppTemplate from) {
+      if (from == null)
+         return null;
       ImageBuilder builder = new ImageBuilder();
       builder.ids(from.getHref().toASCIIString());
       builder.uri(from.getHref());
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImagesInVCloudExpressOrg.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImagesInVCloudExpressOrg.java
index 3440b8d0fb..8699317c0e 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImagesInVCloudExpressOrg.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImagesInVCloudExpressOrg.java
@@ -18,6 +18,8 @@
  */
 package org.jclouds.trmk.vcloud_0_8.compute.functions;
 
+import static com.google.common.base.Predicates.notNull;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
@@ -29,7 +31,7 @@ import org.jclouds.trmk.vcloud_0_8.domain.VAppTemplate;
 import org.jclouds.trmk.vcloud_0_8.functions.AllCatalogItemsInOrg;
 
 import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.FluentIterable;
 
 /**
  * @author Adrian Cole
@@ -54,7 +56,9 @@ public class ImagesInVCloudExpressOrg implements Function<Org, Iterable<? extend
    public Iterable<? extends Image> apply(Org from) {
       Iterable<? extends CatalogItem> catalogs = allCatalogItemsInOrg.apply(from);
       Iterable<? extends VAppTemplate> vAppTemplates = vAppTemplatesForCatalogItems.apply(catalogs);
-      return Iterables.transform(vAppTemplates, imageForVAppTemplateProvider.get().withParent(from));
+      return FluentIterable.from(vAppTemplates)
+                           .transform(imageForVAppTemplateProvider.get().withParent(from))
+                           .filter(notNull());
    }
 
 }