Author: rob.stryker(a)jboss.com Date: 2011-02-23 23:20:05 -0500 (Wed, 23 Feb 2011) New Revision: 29299 Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceStateJob.java branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java Log: JBIDE-8423 - to maintenance branch (smaller patch) Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceStateJob.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceStateJob.java 2011-02-23 23:26:31 UTC (rev 29298) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/InstanceStateJob.java 2011-02-24 04:20:05 UTC (rev 29299) @@ -32,6 +32,8 @@ protected IStatus doRun(IProgressMonitor monitor) throws Exception { String id = getInstance().getId(); getCloud().waitForState(id, expectedState, monitor); + if( monitor.isCanceled()) + return Status.CANCEL_STATUS; return Status.OK_STATUS; } Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-23 23:26:31 UTC (rev 29298) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-24 04:20:05 UTC (rev 29299) @@ -47,8 +47,16 @@ } private IStatus runRSEJob(DeltaCloudInstance instance, IProgressMonitor monitor) { + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } + String hostname = RSEUtils.createHostName(instance); - if (hostname != null && hostname.length() > 0 && isAutoconnect()) { + if (hostname == null || hostname.length() <= 0) { + return Status.CANCEL_STATUS; + } + + if (isAutoconnect()) { try { monitor.beginTask("Create RSE Server", 100); String connectionName = RSEUtils.createConnectionName(instance);