Author: adietish Date: 2010-11-17 11:27:16 -0500 (Wed, 17 Nov 2010) New Revision: 26677 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java Log: [JBIDE-7597] added exception to destroy instance Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-17 16:20:37 UTC (rev 26676) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-17 16:27:16 UTC (rev 26677) @@ -254,7 +254,7 @@ } catch (DeltaCloudException e) { multiException.addError(e); } - + if (!multiException.isEmpty()) { throw multiException; } @@ -414,20 +414,15 @@ } } - public DeltaCloudInstance[] destroyInstance(String instanceId) { - try { - DeltaCloudInstance instance = getInstance(instanceId); - performInstanceAction(instance, DeltaCloudInstance.DESTROY); - instances.remove(instance); - } catch (DeltaCloudException e) { - return null; - } + public DeltaCloudInstance[] destroyInstance(String instanceId) throws DeltaCloudException { + DeltaCloudInstance instance = getInstance(instanceId); + performInstanceAction(instance, DeltaCloudInstance.DESTROY); + instances.remove(instance); // TODO: remove notification with all instances, replace by notifying // the changed instance - DeltaCloudInstance[] instancesArray = instances.toArray(instances.toArray(new DeltaCloudInstance[instances - .size()])); - notifyInstanceListListeners(instancesArray); - return instancesArray; + DeltaCloudInstance[] instances = cloneInstancesArray(); + notifyInstanceListListeners(instances); + return instances; } public void createKey(String keyname, String keystoreLocation) throws DeltaCloudException {