Author: rob.stryker(a)jboss.com Date: 2011-02-02 13:11:13 -0500 (Wed, 02 Feb 2011) New Revision: 28935 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java Log: JBIDE-8131 to trunk Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-02 17:39:29 UTC (rev 28934) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-02 18:11:13 UTC (rev 28935) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.Job; @@ -119,6 +120,9 @@ status = connect(service, monitor); monitor.done(); return status; + } catch(OperationCanceledException oce) { + monitor.done(); + return Status.CANCEL_STATUS; } catch(Exception e) { count += 1000; monitor.worked(1000); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-02 17:39:29 UTC (rev 28934) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2011-02-02 18:11:13 UTC (rev 28935) @@ -63,7 +63,7 @@ SubProgressMonitor submon = new SubProgressMonitor(monitor, 90); initialConnect(host); - RSEUtils.connect(RSEUtils.getConnectorService(host), 90000, submon); + return RSEUtils.connect(RSEUtils.getConnectorService(host), 90000, submon); } catch (Exception e) { return ErrorUtils.handleError(Messages.ERROR, NLS.bind(Messages.COULD_NOT_LAUNCH_RSE_EXPLORER2, instance.getName()),