From 64352f83170583c343bcf1007cedd9468110d305 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 18 Oct 2016 17:37:33 +0300 Subject: [PATCH] javac ast indices: Javac8RefScanner should be added to CP --- .../org/jetbrains/jps/cmdline/ClasspathBootstrap.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java index 2aba21bc91e4..5fefc7dff7ba 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java @@ -312,14 +312,14 @@ public class ClasspathBootstrap { } private static List getJavac8RefScannerClasspath() { - String jpsBuildersPath = getResourcePath(ClasspathBootstrap.class); - File jpsBuilders = new File(jpsBuildersPath); - if (jpsBuilders.isDirectory()) { + String instrumentationPath = getResourcePath(NotNullVerifyingInstrumenter.class); + File instrumentationUtil = new File(instrumentationPath); + if (instrumentationUtil.isDirectory()) { //running from sources: load classes from .../out/production/javac-ref-scanner-8 - return Collections.singletonList(new File(jpsBuilders.getParentFile(), "javac-ref-scanner-8").getAbsolutePath()); + return Collections.singletonList(new File(instrumentationUtil.getParentFile(), "javac-ref-scanner-8").getAbsolutePath()); } else { - return Collections.emptyList(); + return Collections.singletonList(instrumentationPath); } } }