Merge pull request #808 from Thisara-Welmilla/improve-redeploy-publisher

wso2-extensions · Feb 20, 2024 · 9a5af21 · 9a5af21
2 parents 4ab54bd + 1bbe4c9
commit 9a5af21
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/.../main/java/org/wso2/carbon/identity/tenant/resource/manager/core/ResourceManagerImpl.java b/.../main/java/org/wso2/carbon/identity/tenant/resource/manager/core/ResourceManagerImpl.java
@@ -126,11 +126,24 @@ private void deployEventPublisherConfiguration(InputStream publisherConfig)
             return;
         }
 
-        if (TenantResourceManagerDataHolder.getInstance().getCarbonEventPublisherService()
-                .getActiveEventPublisherConfiguration(eventPublisherConfiguration.getEventPublisherName()) != null) {
+        EventPublisherConfiguration oldEventPublisherConfiguration = TenantResourceManagerDataHolder.getInstance()
+                .getCarbonEventPublisherService().getActiveEventPublisherConfiguration(
+                        eventPublisherConfiguration.getEventPublisherName());
+
+        if (oldEventPublisherConfiguration != null) {
             destroyEventPublisherConfiguration(eventPublisherConfiguration.getEventPublisherName());
         }
-        carbonEventPublisherService.addEventPublisherConfiguration(eventPublisherConfiguration);
+
+        try {
+            carbonEventPublisherService.addEventPublisherConfiguration(eventPublisherConfiguration);
+        } catch (EventPublisherConfigurationException e) {
+            if (oldEventPublisherConfiguration != null) {
+                carbonEventPublisherService.addEventPublisherConfiguration(oldEventPublisherConfiguration);
+                log.warn("The redeploying event publisher configuration fails. " +
+                        "Hence redeploying old configuration.");
+            }
+            throw e;
+        }
     }
 
     /**