From 31ab697103dc367b7c968670d37b131a4db2fca3 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 7 Mar 2013 19:36:58 +0100 Subject: [PATCH] workaround groovy runner NPE (EA-44399) --- .../plugins/groovy/runner/DefaultGroovyScriptRunner.java | 4 +++- .../jetbrains/plugins/groovy/runner/GroovyScriptRunner.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java index 7bd62c3bb8ba..abf532318f13 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java @@ -97,7 +97,9 @@ public class DefaultGroovyScriptRunner extends GroovyScriptRunner { if (groovyHome != null) { groovyHome = FileUtil.toSystemDependentName(groovyHome); } - setGroovyHome(params, groovyHome); + if (groovyHome != null) { + setGroovyHome(params, groovyHome); + } final String confPath = getConfPath(groovyHome); params.getVMParametersList().add("-Dgroovy.starter.conf=" + confPath); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java index 8e91bc7d33dd..87ee64a6fff9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java @@ -79,7 +79,7 @@ public abstract class GroovyScriptRunner { } } - protected static void setGroovyHome(JavaParameters params, String groovyHome) { + protected static void setGroovyHome(JavaParameters params, @NotNull String groovyHome) { params.getVMParametersList().add("-Dgroovy.home=" + groovyHome); if (groovyHome.contains("grails")) { //a bit of a hack params.getVMParametersList().add("-Dgrails.home=" + groovyHome);