This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit e8f40f1844f80bdb6e8c6ece401c30a38aaa5f7f Author: frogfather <[email protected]> AuthorDate: Fri Dec 20 16:54:14 2019 +0000 changes in response to code review --- .../brooklyn/location/jclouds/AbstractComputeServiceRegistry.java | 2 +- .../java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractComputeServiceRegistry.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractComputeServiceRegistry.java index 1520df3..8e4c423 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractComputeServiceRegistry.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractComputeServiceRegistry.java @@ -57,7 +57,7 @@ public abstract class AbstractComputeServiceRegistry implements ComputeServiceRe private final Map<Map<?, ?>, ComputeService> cachedComputeServices = new ConcurrentHashMap<>(); @Override - public ComputeService findComputeService(ConfigBag conf, boolean allowReuse) throws IllegalArgumentException { + public ComputeService findComputeService(ConfigBag conf, boolean allowReuse) { JCloudsPropertiesBuilder propertiesBuilder = new JCloudsPropertiesBuilder(conf) .setCommonJcloudsProperties(); diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index c6940a8..8d9a889 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -612,9 +612,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im for (int i = 1; i <= attempts; i++) { try { return obtainOnce(setup); - } catch (IllegalArgumentException e) { - LOG.warn("Attempt #{}/{} to obtain machine threw error: {}", new Object[]{i, attempts, e}); - exceptions.add(e); } catch (RuntimeException e) { LOG.warn("Attempt #{}/{} to obtain machine threw error: {}", new Object[]{i, attempts, e}); exceptions.add(e);
