From 9540d909d0af9586b83b8bc504760e1f8b7768bb Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Wed, 26 Oct 2016 00:23:13 -0400 Subject: [PATCH] Handle null found project for default java project finder --- .../java/DefaultJavaProjectFinder.java | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java index 2a059a9c1..5e30bee0e 100644 --- a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java +++ b/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java @@ -1,24 +1,27 @@ -package org.springframework.ide.vscode.commons.languageserver.java; - -import org.springframework.ide.vscode.commons.java.IJavaProject; -import org.springframework.ide.vscode.commons.languageserver.util.IDocument; - -public class DefaultJavaProjectFinder implements JavaProjectFinder { - - private final IJavaProjectFinderStrategy[] STRATEGIES = new IJavaProjectFinderStrategy[] { - new JavaProjectWithClasspathFileFinderStrategy(), - new MavenProjectFinderStrategy() - }; - - @Override - public IJavaProject find(IDocument d) { - for (IJavaProjectFinderStrategy strategy : STRATEGIES) { - try { - return strategy.find(d); - } catch (Throwable t) { - // Log perhaps? - } - } - return null; - } -} +package org.springframework.ide.vscode.commons.languageserver.java; + +import org.springframework.ide.vscode.commons.java.IJavaProject; +import org.springframework.ide.vscode.commons.languageserver.util.IDocument; + +public class DefaultJavaProjectFinder implements JavaProjectFinder { + + private final IJavaProjectFinderStrategy[] STRATEGIES = new IJavaProjectFinderStrategy[] { + new JavaProjectWithClasspathFileFinderStrategy(), + new MavenProjectFinderStrategy() + }; + + @Override + public IJavaProject find(IDocument d) { + for (IJavaProjectFinderStrategy strategy : STRATEGIES) { + try { + IJavaProject project = strategy.find(d); + if (project != null) { + return project; + } + } catch (Throwable t) { + // Log perhaps? + } + } + return null; + } +}