Merge pull request #1002 from spartusch/fix-npe-when-using-management-port

Fix NPE when using management port and spring.application.name is set

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/ActuatorProvider.java

@@ -30,6 +30,7 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.web.context.WebServerApplicationContext;
 import org.springframework.boot.web.context.WebServerInitializedEvent;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.context.ApplicationContext;
@@ -102,12 +103,11 @@ public ActuatorProvider(Optional<ManagementServerProperties> managementServerPro
 
 	@Override
 	public void onApplicationEvent(WebServerInitializedEvent event) {
-		if ("application".equals(event.getApplicationContext().getId())) {
-			applicationWebServer = event.getWebServer();
-		}
-		else if ("application:management".equals(event.getApplicationContext().getId())) {
+		if (WebServerApplicationContext.hasServerNamespace(event.getApplicationContext(), "management")) {
 			managementApplicationContext = event.getApplicationContext();
 			actuatorWebServer = event.getWebServer();
+		} else {
+			applicationWebServer = event.getWebServer();
 		}
 	}