Skip to content

Commit c92ae8a

Browse files
committed
Add null check for main class
1 parent c043013 commit c92ae8a

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/FindMainClassTask.groovy

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ class FindMainClassTask extends DefaultTask {
2626
def bootExtension = project.extensions.findByType(SpringBootPluginExtension)
2727
if ( bootExtension != null ) {
2828
def mainClass = findMainClass()
29-
bootExtension.setMainClass(mainClass)
30-
JavaExec javaExec = (JavaExec)project.tasks.findByName("bootRun")
31-
javaExec.setMain(mainClass)
29+
if(mainClass != null) {
30+
bootExtension.setMainClass(mainClass)
31+
JavaExec javaExec = (JavaExec)project.tasks.findByName("bootRun")
32+
javaExec.setMain(mainClass)
3233

33-
ExtraPropertiesExtension extraProperties = (ExtraPropertiesExtension) getProject()
34-
.getExtensions().getByName("ext");
35-
extraProperties.set("mainClassName", mainClass)
34+
ExtraPropertiesExtension extraProperties = (ExtraPropertiesExtension) getProject()
35+
.getExtensions().getByName("ext");
36+
extraProperties.set("mainClassName", mainClass)
37+
}
3638
}
3739
}
3840

@@ -60,7 +62,9 @@ class FindMainClassTask extends DefaultTask {
6062
MainClassFinder mainClassFinder = createMainClassFinder()
6163

6264
def mainClass = mainClassFinder.findMainClass(mainSourceSet.output.classesDir)
63-
mainClassFile.text = mainClass
65+
if(mainClass != null) {
66+
mainClassFile.text = mainClass
67+
}
6468
return mainClass
6569
}
6670

0 commit comments

Comments
 (0)