From b4a2315dbcac9350721cfbc17f221eb935160981 Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 15 Oct 2018 08:35:48 +0200 Subject: Bug 540122 - Could not initialize class org.eclipse.jdt.internal.core.JavaModelManager In case platform is not started, we get a NPE asking for Platform.getOS(). So read "os.name" system property instead (which is always set). Change-Id: I9e13a461131b7c25f760edd246029bf00c7f279d Signed-off-by: Andrey Loskutov --- .../model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java index 77ac23c416..deb0371b41 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ExternalFoldersManager.java @@ -55,10 +55,9 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.DeltaProcessor.RootInfo; import org.eclipse.jdt.internal.core.util.Messages; import org.eclipse.jdt.internal.core.util.Util; -import org.eclipse.osgi.service.environment.Constants; public class ExternalFoldersManager { - private static final boolean WINDOWS = Platform.getOS().equals(Constants.OS_WIN32); + private static final boolean WINDOWS = System.getProperty("os.name").startsWith("Win"); //$NON-NLS-1$//$NON-NLS-2$ private static final String EXTERNAL_PROJECT_NAME = ".org.eclipse.jdt.core.external.folders"; //$NON-NLS-1$ private static final String LINKED_FOLDER_NAME = ".link"; //$NON-NLS-1$ private Map folders; -- cgit v1.2.3