MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 09:03:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

workaround groovy runner NPE (EA-44399)

Browse Source
This commit is contained in:
peter
2013-03-07 21:18:47 +01:00
parent 8a76dea00c
commit 31ab697103
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java
+3 -1
View File
@@ -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);
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java
+1 -1
View File
@@ -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);