From 221d0f20387abeed4df13ccee50ea533ecdcea50 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 19 Nov 2018 07:55:36 +0100 Subject: [PATCH] GH-234 Fixed Function-Class detection Fixed Function-Class detection to ensure it is not treated as main. The regression was introduced with 0287a5d Resolves #234 --- .../function/deployer/FunctionCreatorConfiguration.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java index 124a25ed6..46a846a9c 100644 --- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java +++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java @@ -216,10 +216,7 @@ class FunctionCreatorConfiguration { Manifest manifest = getArchive().getManifest(); String mainClass = null; if (manifest != null) { - mainClass = manifest.getMainAttributes().getValue("Function-Class"); - if (mainClass == null) { - mainClass = manifest.getMainAttributes().getValue("Start-Class"); - } + mainClass = manifest.getMainAttributes().getValue("Start-Class"); if (mainClass == null // Not surefire or IntelliJ && !getArchive().getUrl().toString().endsWith(".jar!/")) {