Merge pull request #3586 from DedunuKarunarathne/server-startup

Move Inbound Endpoint Listeners Startup to StartupFinalizer
wso2 · Sep 3, 2024 · 55e2724 · 55e2724
2 parents 676d83d + 5e0aedc
commit 55e2724
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...nitializer/src/main/java/org/wso2/micro/integrator/initializer/ServiceBusInitializer.java b/...nitializer/src/main/java/org/wso2/micro/integrator/initializer/ServiceBusInitializer.java
@@ -48,7 +48,6 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
-import org.wso2.carbon.inbound.endpoint.EndpointListenerLoader;
 import org.wso2.carbon.securevault.SecretCallbackHandlerService;
 import org.wso2.config.mapper.ConfigParser;
 import org.wso2.micro.application.deployer.CarbonApplication;
@@ -241,8 +240,6 @@ protected void activate(ComponentContext ctxt) {
             bndCtx.registerService(SynapseRegistrationsService.class.getName(), synRegistrationsSvc, null);
             /*configCtxSvc.getServerConfigContext().setProperty(ConfigurationManager.CONFIGURATION_MANAGER,
                     configurationManager);*/
-            // Start Inbound Endpoint Listeners
-            EndpointListenerLoader.loadListeners();
             String injectCarName = System.getProperty(ServiceBusConstants.AUTOMATION_MODE_CAR_NAME_SYSTEM_PROPERTY);
             if (injectCarName != null && !injectCarName.isEmpty()) {
                 String sequenceName = getMainSequenceName(injectCarName);

diff --git a/...tor.initializer/src/main/java/org/wso2/micro/integrator/initializer/StartupFinalizer.java b/...tor.initializer/src/main/java/org/wso2/micro/integrator/initializer/StartupFinalizer.java
@@ -26,6 +26,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.wso2.carbon.inbound.endpoint.EndpointListenerLoader;
 import org.wso2.micro.core.ServerStatus;
 import org.wso2.micro.integrator.initializer.utils.ConfigurationHolder;
 
@@ -78,6 +79,9 @@ private void completeInitialization() {
         // Init and start axis2 transports
         listenerManager.startSystem(configCtx);
 
+        // Start Inbound Endpoint Listeners
+        EndpointListenerLoader.loadListeners();
+
         /*listerManagerServiceRegistration =
                 bundleContext.registerService(ListenerManager.class.getName(), listenerManager, null);*/