[jbosstools-commits] JBoss Tools SVN: r28363 - branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

Author: rob.stryker(a)jboss.com Date: 2011-01-18 11:50:39 -0500 (Tue, 18 Jan 2011) New Revision: 28363 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java Log: JBIDE-8122 cr1 patch2 Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java =================================================================== --- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:48:09 UTC (rev 28362) +++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:50:39 UTC (rev 28363) @@ -59,9 +59,15 @@ } public IRuntimeWorkingCopy searchForRuntimes(IPath path, ServerBeanLoader loader, IProgressMonitor monitor) { + if( monitor.isCanceled()) + return null; + if( loader.getServerType(path.toFile()) != JBossServerType.UNKNOWN) { // return found - return createRuntime(path, loader); + IRuntimeWorkingCopy wc = createRuntime(path, loader); + if( wc == null ) + monitor.setCanceled(true); + return wc; } File[] children = path.toFile().listFiles(); children = (children == null ? new File[]{} : children);