From 49067c673eaf909fd7f07c7f0da681237356f9d0 Mon Sep 17 00:00:00 2001 From: Kevin Blaszczyk Date: Tue, 2 Jun 2026 14:36:03 +0200 Subject: [PATCH] Fix service initialization logs for multitenancy --- .../service/EventHubMessagingService.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cds-feature-event-hub/src/main/java/com/sap/cds/feature/messaging/eventhub/service/EventHubMessagingService.java b/cds-feature-event-hub/src/main/java/com/sap/cds/feature/messaging/eventhub/service/EventHubMessagingService.java index ffa1cbf..a6616cc 100644 --- a/cds-feature-event-hub/src/main/java/com/sap/cds/feature/messaging/eventhub/service/EventHubMessagingService.java +++ b/cds-feature-event-hub/src/main/java/com/sap/cds/feature/messaging/eventhub/service/EventHubMessagingService.java @@ -53,14 +53,19 @@ public EventHubMessagingService(ServiceBinding binding, MessagingServiceConfig s logger.error("Missing ceSource in binding credentials, emit() will be deactivated"); } - if (binding.getCredentials().containsKey(SYSTEM_ID)) { - this.systemId = (String) binding.getCredentials().get(SYSTEM_ID); - } else { + isMultitenant = EventHubBindingUtils.isBindingMultitenant(binding); + + if (isMultitenant) { this.systemId = null; - logger.error("Missing systemId in binding credentials, emit() will be deactivated"); + } else { + if (binding.getCredentials().containsKey(SYSTEM_ID)) { + this.systemId = (String) binding.getCredentials().get(SYSTEM_ID); + } else { + this.systemId = null; + logger.error("Missing systemId in binding credentials, emit() will be deactivated"); + } } - this.isMultitenant = EventHubBindingUtils.isBindingMultitenant(binding); this.queueListener = new MessagingBrokerQueueListener(this, serviceConfig, toFullyQualifiedQueueName(queue), queue, cdsRuntime); if (EventHubBindingUtils.bindingHasEndpoints(binding)) {