7903151: NPE when resolving @library from jtreg plugin

Reviewed-by: djelinski, jjg
openjdk · Apr 28, 2022 · bc75e5f · bc75e5f
1 parent c415cd0
commit bc75e5f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/plugins/idea/README.md b/plugins/idea/README.md
@@ -38,7 +38,7 @@ This will download gradle and the required IntelliJ dependencies, will build the
 
 > Note: to build the plugin, the build script must point to a valid jtreg installation; see the property `jtregHome` in the `gradle.properties` file, and tweak accordingly.
 
-> Note: the property `intellijVersion` can be used to specify which IDE version should the plugin depend on (defaults to `2021.1`).
+> Note: the property `minBuild` can be used to specify which IDE version should the plugin depend. The value of this property should be a valid IntelliJ [release build number](https://www.jetbrains.com/intellij-repository/releases/) (defaults to `IC-211.7142.45`).
 
 Once the build is configured correctly, the plugin can even be tested in a sandbox environment, as follows:
 

diff --git a/plugins/idea/build.gradle b/plugins/idea/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
+    version = minBuild
     plugins = ['java', 'AntSupport', 'TestNG-J']
 }
 

diff --git a/plugins/idea/gradle.properties b/plugins/idea/gradle.properties
@@ -1,7 +1,7 @@
 jtregHome = /path/to/jtreg
-minBuild = 211
-pluginVersion = 1.14
+minBuild = IC-211.7142.45
+pluginVersion = 1.15
 javaLevel = 11
 notes = <ul>\
-<li>Fix debugging support for 2021.3</li>\
+<li>Fix NPE when resolving @library tag</li>\
 </ul>
diff --git a/plugins/idea/src/main/java/com/oracle/plugin/jtreg/util/JTRegUtils.java b/plugins/idea/src/main/java/com/oracle/plugin/jtreg/util/JTRegUtils.java
@@ -241,8 +241,9 @@ public static List<VirtualFile> getJTRegRoots(PsiFile file) {
                                         LOG.debug("Nothing found relative to test suite root.");
                                         Properties testSuiteConfig = testSuiteConfigForRootFile(testRootFile);
                                         if (testSuiteConfig != null) {
-                                            String s = testSuiteConfig.getProperty("external.lib.roots").trim();
+                                            String s = testSuiteConfig.getProperty("external.lib.roots");
                                             if (s != null) {
+                                                s = s.trim();
                                                 LOG.debug("external.lib.roots = \"" + s + "\"");
                                                 // Note: jtreg tag specification for "external.lib.roots" talks about a
                                                 // search path with separate segments; however, all usages I see in our