fixed auth error when using an ssl site via ip and not hostname

apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java

@@ -32,7 +32,7 @@ import org.jclouds.compute.domain.Image;
 import org.jclouds.ec2.compute.EC2ComputeService;
 import org.jclouds.ec2.compute.domain.RegionAndName;
 import org.jclouds.ec2.compute.suppliers.RegionAndNameToImageSupplier;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 
 import com.google.common.base.Supplier;
 import com.google.inject.Provides;
@@ -59,7 +59,7 @@ public class EC2ComputeServiceContextModule extends BaseComputeServiceContextMod
    @Singleton
    protected Supplier<Map<RegionAndName, ? extends Image>> provideRegionAndNameToImageSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, final RegionAndNameToImageSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<RegionAndName, ? extends Image>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<RegionAndName, ? extends Image>>(
                authException, seconds, new Supplier<Map<RegionAndName, ? extends Image>>() {
                   @Override
                   public Map<RegionAndName, ? extends Image> get() {

apis/vcloud/src/main/java/org/jclouds/vcloud/config/BaseVCloudRestClientModule.java

@@ -30,7 +30,7 @@ import javax.inject.Singleton;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.rest.AsyncClientFactory;
 import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 import org.jclouds.vcloud.VCloudAsyncClient;
 import org.jclouds.vcloud.VCloudClient;
 import org.jclouds.vcloud.VCloudLoginAsyncClient;
@@ -78,7 +78,7 @@ public abstract class BaseVCloudRestClientModule<S extends VCloudClient, A exten
    @Singleton
    protected Supplier<VCloudSession> provideVCloudTokenCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
          final VCloudLoginAsyncClient login) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<VCloudSession>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<VCloudSession>(authException, seconds,
             new Supplier<VCloudSession>() {
 
                @Override

apis/vcloudexpress/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java

@@ -30,7 +30,7 @@ import javax.inject.Singleton;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.rest.AsyncClientFactory;
 import org.jclouds.rest.ConfiguresRestClient;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 import org.jclouds.vcloud.VCloudExpressAsyncClient;
 import org.jclouds.vcloud.VCloudExpressClient;
 import org.jclouds.vcloud.VCloudExpressLoginAsyncClient;
@@ -78,7 +78,7 @@ public abstract class BaseVCloudExpressRestClientModule<S extends VCloudExpressC
    @Singleton
    protected Supplier<VCloudSession> provideVCloudTokenCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
          final VCloudExpressLoginAsyncClient login) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<VCloudSession>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<VCloudSession>(authException, seconds,
             new Supplier<VCloudSession>() {
 
                @Override

common/trmk/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkRestClientModule.java

@@ -32,7 +32,7 @@ import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.annotation.ClientError;
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 import org.jclouds.util.Strings2;
 import org.jclouds.vcloud.config.BaseVCloudExpressRestClientModule;
 import org.jclouds.vcloud.domain.ReferenceType;
@@ -109,7 +109,7 @@ public abstract class TerremarkRestClientModule<S extends TerremarkVCloudClient,
    @KeysList
    protected Supplier<Map<String, ReferenceType>> provideOrgToKeysListCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, final OrgNameToKeysListSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, ReferenceType>>(authException,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, ReferenceType>>(authException,
                seconds, new Supplier<Map<String, ReferenceType>>() {
                   @Override
                   public Map<String, ReferenceType> get() {

common/vcloud/src/main/java/org/jclouds/vcloud/config/CommonVCloudRestClientModule.java

@@ -60,7 +60,7 @@ import org.jclouds.rest.AsyncClientFactory;
 import org.jclouds.rest.AuthorizationException;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.config.RestClientModule;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 import org.jclouds.vcloud.CommonVCloudAsyncClient;
 import org.jclouds.vcloud.CommonVCloudClient;
 import org.jclouds.vcloud.VCloudToken;
@@ -146,7 +146,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @org.jclouds.vcloud.endpoints.VDC
    protected Supplier<Map<String, String>> provideVDCtoORG(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
             final Supplier<Map<String, ? extends Org>> orgToVDCSupplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, String>>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, String>>(authException, seconds,
                new Supplier<Map<String, String>>() {
                   @Override
                   public Map<String, String> get() {
@@ -193,7 +193,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @Singleton
    protected Supplier<Map<String, ? extends Org>> provideOrgMapCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
             final OrgMapSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, ? extends Org>>(authException,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, ? extends Org>>(authException,
                seconds, new Supplier<Map<String, ? extends Org>>() {
                   @Override
                   public Map<String, ? extends Org> get() {
@@ -287,7 +287,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @Singleton
    protected Supplier<Map<String, ReferenceType>> provideVDCtoORG(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
             final OrgNameToOrgSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, ReferenceType>>(authException,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, ReferenceType>>(authException,
                seconds, new Supplier<Map<String, ReferenceType>>() {
                   @Override
                   public Map<String, ReferenceType> get() {
@@ -300,7 +300,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @Singleton
    protected Supplier<Map<URI, ? extends org.jclouds.vcloud.domain.VDC>> provideURIToVDC(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, final URItoVDC supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<URI, ? extends org.jclouds.vcloud.domain.VDC>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<URI, ? extends org.jclouds.vcloud.domain.VDC>>(
                authException, seconds, new Supplier<Map<URI, ? extends org.jclouds.vcloud.domain.VDC>>() {
                   @Override
                   public Map<URI, ? extends org.jclouds.vcloud.domain.VDC> get() {
@@ -463,7 +463,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @Singleton
    protected Supplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.Catalog>>> provideOrgCatalogItemMapSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, final OrgCatalogSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.Catalog>>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.Catalog>>>(
                authException, seconds,
                new Supplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.Catalog>>>() {
                   @Override
@@ -478,7 +478,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @Singleton
    protected Supplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.VDC>>> provideOrgVDCSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, final OrgVDCSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.VDC>>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.VDC>>>(
                authException, seconds,
                new Supplier<Map<String, Map<String, ? extends org.jclouds.vcloud.domain.VDC>>>() {
                   @Override
@@ -561,7 +561,7 @@ public class CommonVCloudRestClientModule<S extends CommonVCloudClient, A extend
    @Singleton
    protected Supplier<Map<String, Map<String, Map<String, ? extends org.jclouds.vcloud.domain.CatalogItem>>>> provideOrgCatalogItemSupplierCache(
             @Named(PROPERTY_SESSION_INTERVAL) long seconds, final OrgCatalogItemSupplier supplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, Map<String, ? extends org.jclouds.vcloud.domain.CatalogItem>>>>(
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Map<String, Map<String, Map<String, ? extends org.jclouds.vcloud.domain.CatalogItem>>>>(
                authException, seconds,
                new Supplier<Map<String, Map<String, Map<String, ? extends org.jclouds.vcloud.domain.CatalogItem>>>>() {
                   @Override

compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java

@@ -52,7 +52,7 @@ import org.jclouds.compute.strategy.InitializeRunScriptOnNodeOrPlaceInBadMap;
 import org.jclouds.json.Json;
 import org.jclouds.location.config.LocationModule;
 import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 import org.jclouds.scriptbuilder.domain.Statement;
 import org.jclouds.scriptbuilder.domain.Statements;
 import org.jclouds.ssh.SshClient;
@@ -83,19 +83,20 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
       bind(new TypeLiteral<Function<TemplateOptions, Statement>>() {
       }).to(TemplateOptionsToStatement.class);
 
-      install(new FactoryModuleBuilder().implement(RunScriptOnNode.class, Names.named("direct"),
+      install(new FactoryModuleBuilder()
-               RunScriptOnNodeUsingSsh.class).implement(RunScriptOnNode.class, Names.named("blocking"),
+            .implement(RunScriptOnNode.class, Names.named("direct"), RunScriptOnNodeUsingSsh.class)
-               RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.class).implement(RunScriptOnNode.class,
+            .implement(RunScriptOnNode.class, Names.named("blocking"),
-               Names.named("nonblocking"), RunScriptOnNodeAsInitScriptUsingSsh.class).build(
+                  RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilComplete.class)
-               RunScriptOnNodeFactoryImpl.Factory.class));
+            .implement(RunScriptOnNode.class, Names.named("nonblocking"), RunScriptOnNodeAsInitScriptUsingSsh.class)
+            .build(RunScriptOnNodeFactoryImpl.Factory.class));
 
       bind(RunScriptOnNode.Factory.class).to(RunScriptOnNodeFactoryImpl.class);
 
       install(new FactoryModuleBuilder().implement(new TypeLiteral<Callable<Void>>() {
-      }, CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.class).implement(
+      }, CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.class)
-               new TypeLiteral<Function<NodeMetadata, Void>>() {
+            .implement(new TypeLiteral<Function<NodeMetadata, Void>>() {
-               }, CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.class).build(
+            }, CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.class)
-               CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.Factory.class));
+            .build(CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.Factory.class));
 
       install(new FactoryModuleBuilder().implement(new TypeLiteral<Callable<RunScriptOnNode>>() {
       }, InitializeRunScriptOnNodeOrPlaceInBadMap.class).build(InitializeRunScriptOnNodeOrPlaceInBadMap.Factory.class));
@@ -129,8 +130,8 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
          checkNotNull(runScript, "runScript");
          checkNotNull(options, "options");
          return !options.shouldWrapInInitScript() ? factory.exec(node, runScript, options) : (options
-                  .shouldBlockOnComplete() ? factory.backgroundAndBlockOnComplete(node, runScript, options) : factory
+               .shouldBlockOnComplete() ? factory.backgroundAndBlockOnComplete(node, runScript, options) : factory
-                  .background(node, runScript, options));
+               .background(node, runScript, options));
       }
 
       @Override
@@ -197,14 +198,14 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
    @Singleton
    @Memoized
    protected Supplier<Set<? extends Image>> supplyImageCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
-            final Supplier<Set<? extends Image>> imageSupplier) {
+         final Supplier<Set<? extends Image>> imageSupplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Image>>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Image>>(authException, seconds,
-               new Supplier<Set<? extends Image>>() {
+            new Supplier<Set<? extends Image>>() {
-                  @Override
+               @Override
-                  public Set<? extends Image> get() {
+               public Set<? extends Image> get() {
-                     return imageSupplier.get();
+                  return imageSupplier.get();
-                  }
+               }
-               });
+            });
    }
 
    @Provides
@@ -231,14 +232,14 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
    @Singleton
    @Memoized
    protected Supplier<Set<? extends Hardware>> supplySizeCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
-            final Supplier<Set<? extends Hardware>> hardwareSupplier) {
+         final Supplier<Set<? extends Hardware>> hardwareSupplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Hardware>>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Hardware>>(authException, seconds,
-               new Supplier<Set<? extends Hardware>>() {
+            new Supplier<Set<? extends Hardware>>() {
-                  @Override
+               @Override
-                  public Set<? extends Hardware> get() {
+               public Set<? extends Hardware> get() {
-                     return hardwareSupplier.get();
+                  return hardwareSupplier.get();
-                  }
+               }
-               });
+            });
    }
 
    @Provides

core/src/main/java/org/jclouds/location/config/LocationModule.java

@@ -31,7 +31,7 @@ import javax.inject.Singleton;
 import org.jclouds.collect.Memoized;
 import org.jclouds.domain.Location;
 import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
@@ -81,7 +81,7 @@ public class LocationModule extends AbstractModule {
    @Memoized
    protected Supplier<Set<? extends Location>> supplyLocationCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
             final Supplier<Set<? extends Location>> locationSupplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Location>>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Location>>(authException, seconds,
                new Supplier<Set<? extends Location>>() {
                   @Override
                   public Set<? extends Location> get() {

core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java

@@ -19,6 +19,8 @@
 
 package org.jclouds.rest.suppliers;
 
+import static com.google.common.base.Suppliers.memoizeWithExpiration;
+
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -26,8 +28,6 @@ import org.jclouds.concurrent.RetryOnTimeOutExceptionSupplier;
 import org.jclouds.rest.AuthorizationException;
 
 import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
 
 /**
  * This will retry the supplier if it encounters a timeout exception, but not if it encounters an
@@ -44,33 +44,15 @@ import com.google.common.base.Throwables;
  * 
  * @author Adrian Cole
  */
-public class RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> implements Supplier<T> {
+public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> implements Supplier<T> {
    private final Supplier<T> delegate;
+   private final long seconds;
 
-   public RetryOnTimeOutButNotOnAuthorizationExceptionSupplier(
+   public MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier(
-         final AtomicReference<AuthorizationException> authException, final long seconds, final Supplier<T> delegate) {
+         AtomicReference<AuthorizationException> authException, long seconds, Supplier<T> delegate) {
-      this.delegate = Suppliers.<T> memoizeWithExpiration(new RetryOnTimeOutExceptionSupplier<T>(new Supplier<T>() {
+      this.delegate = memoizeWithExpiration(new RetryOnTimeOutExceptionSupplier<T>(
-         public T get() {
+            new SetAndThrowAuthorizationExceptionSupplier<T>(delegate, authException)), seconds, TimeUnit.SECONDS);
-            if (authException.get() != null)
+      this.seconds = seconds;
-               throw authException.get();
-            try {
-               return delegate.get();
-            } catch (AuthorizationException e) {
-               authException.set(e);
-               throw e;
-            } catch (Exception e) {
-               Throwables.propagate(e);
-               assert false : e;
-               return null;
-            }
-         }
-
-         @Override
-         public String toString() {
-            return "memoizeWithExpiration(" + delegate + ", seconds=" + seconds + ")";
-         }
-
-      }), seconds, TimeUnit.SECONDS);
    }
 
    @Override
@@ -80,7 +62,6 @@ public class RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> implements
 
    @Override
    public String toString() {
-      return "RetryOnTimeOutButNotOnAuthorizationExceptionSupplier(" + delegate + ")";
+      return "memoizeWithExpiration(" + delegate + ", seconds=" + seconds + ")";
    }
-
 }

core/src/main/java/org/jclouds/rest/suppliers/SetAndThrowAuthorizationExceptionSupplier.java

@@ -0,0 +1,71 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.jclouds.rest.suppliers;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Throwables.propagate;
+import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.jclouds.rest.AuthorizationException;
+
+import com.google.common.base.Supplier;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class SetAndThrowAuthorizationExceptionSupplier<T> implements Supplier<T> {
+   private final Supplier<T> delegate;
+   private final AtomicReference<AuthorizationException> authException;
+
+   public SetAndThrowAuthorizationExceptionSupplier(Supplier<T> delegate,
+         AtomicReference<AuthorizationException> authException) {
+      this.delegate = checkNotNull(delegate, "delegate");
+      this.authException = checkNotNull(authException, "authException");
+   }
+
+   public T get() {
+      if (authException.get() != null)
+         throw authException.get();
+      try {
+         return delegate.get();
+      } catch (AuthorizationException e) {
+         authException.set(e);
+         throw e;
+      } catch (Exception e) {
+         AuthorizationException aex = getFirstThrowableOfType(e, AuthorizationException.class);
+         if (aex != null) {
+            authException.set(aex);
+            throw aex;
+         }
+         propagate(e);
+         assert false : e;
+         return null;
+      }
+   }
+
+   @Override
+   public String toString() {
+      return "RetryOnTimeOutButNotOnAuthorizationExceptionSupplier(" + delegate + ")";
+   }
+
+}

core/src/test/java/org/jclouds/rest/suppliers/SetAndThrowAuthorizationExceptionSupplierTest.java

@@ -0,0 +1,97 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.jclouds.rest.suppliers;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.jclouds.rest.AuthorizationException;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+
+/**
+ * Tests behavior of {@code SetAndThrowAuthorizationExceptionSupplier}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit")
+public class SetAndThrowAuthorizationExceptionSupplierTest {
+   @Test
+   public void testNormal() {
+      AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
+      assertEquals(
+            new SetAndThrowAuthorizationExceptionSupplier<String>(Suppliers.ofInstance("foo"), authException).get(),
+            "foo");
+      assertEquals(authException.get(), null);
+   }
+
+   @Test(expectedExceptions = AuthorizationException.class)
+   public void testThrowsAuthorizationExceptionAndAlsoSetsExceptionType() {
+      AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
+      try {
+         new SetAndThrowAuthorizationExceptionSupplier<String>(new Supplier<String>() {
+
+            @Override
+            public String get() {
+               throw new AuthorizationException();
+            }
+         }, authException).get();
+      } finally {
+         assertEquals(authException.get().getClass(), AuthorizationException.class);
+      }
+   }
+
+   @Test(expectedExceptions = AuthorizationException.class)
+   public void testThrowsAuthorizationExceptionAndAlsoSetsExceptionTypeWhenNested() {
+      AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
+      try {
+         new SetAndThrowAuthorizationExceptionSupplier<String>(new Supplier<String>() {
+
+            @Override
+            public String get() {
+               throw new RuntimeException(new ExecutionException(new AuthorizationException()));
+            }
+         }, authException).get();
+      } finally {
+         assertEquals(authException.get().getClass(), AuthorizationException.class);
+      }
+   }
+
+   @Test(expectedExceptions = RuntimeException.class)
+   public void testThrowsOriginalExceptionAndAlsoSetsExceptionTypeWhenNestedAndNotAuthorizationException() {
+      AtomicReference<AuthorizationException> authException = new AtomicReference<AuthorizationException>();
+      try {
+         new SetAndThrowAuthorizationExceptionSupplier<String>(new Supplier<String>() {
+
+            @Override
+            public String get() {
+               throw new RuntimeException(new IllegalArgumentException("foo"));
+            }
+         }, authException).get();
+      } finally {
+         assertEquals(authException.get().getClass(), RuntimeException.class);
+      }
+   }
+
+}

loadbalancer/src/main/java/org/jclouds/loadbalancer/config/BaseLoadBalancerServiceContextModule.java

@@ -31,7 +31,7 @@ import javax.inject.Singleton;
 import org.jclouds.collect.Memoized;
 import org.jclouds.domain.Location;
 import org.jclouds.rest.AuthorizationException;
-import org.jclouds.rest.suppliers.RetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
+import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
@@ -79,7 +79,7 @@ public abstract class BaseLoadBalancerServiceContextModule extends AbstractModul
    @Memoized
    protected Supplier<Set<? extends Location>> supplyLocationCache(@Named(PROPERTY_SESSION_INTERVAL) long seconds,
          final Supplier<Set<? extends Location>> locationSupplier) {
-      return new RetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Location>>(authException, seconds,
+      return new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<Set<? extends Location>>(authException, seconds,
             new Supplier<Set<? extends Location>>() {
                @Override
                public Set<? extends Location> get() {