SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-234 Fixed Function-Class detection

Browse Source 
Fixed Function-Class detection to ensure it is not treated as main. The regression was introduced with 0287a5d

Resolves #234
This commit is contained in:
Oleg Zhurakousky
2018-11-19 07:55:36 +01:00
parent 7ea5167543
commit 221d0f2038
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
View File

@@ -216,10 +216,7 @@ class FunctionCreatorConfiguration {
Manifest manifest = getArchive().getManifest(); Manifest manifest = getArchive().getManifest();
String mainClass = null; String mainClass = null;
if (manifest != null) { if (manifest != null) {
mainClass = manifest.getMainAttributes().getValue("Function-Class"); mainClass = manifest.getMainAttributes().getValue("Start-Class");
if (mainClass == null) {
mainClass = manifest.getMainAttributes().getValue("Start-Class");
}
if (mainClass == null if (mainClass == null
// Not surefire or IntelliJ // Not surefire or IntelliJ
&& !getArchive().getUrl().toString().endsWith(".jar!/")) { && !getArchive().getUrl().toString().endsWith(".jar!/")) {