diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/pom.xml b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/pom.xml
index 9802ff14..edc8d0a5 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/pom.xml
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/pom.xml
@@ -197,8 +197,6 @@
org.apache.commons.lang3;version="${commons-lang3.version}",
org.apache.commons.logging;version="${commons.logging.version}",
org.json;version="${org.json.version}",
-
-
com.fasterxml.jackson.annotation;version="${jackson.databinding.version}",
com.fasterxml.jackson.databind;version="${jackson.databinding.version}",
com.nimbusds.jose;version="${org.wso2.orbit.nimbus.version.range}",
@@ -206,9 +204,7 @@
org.wso2.carbon.identity.oauth2.*;version="${identity.inbound.auth.oauth.version.range}",
org.wso2.financial.services.accelerator.common.*;version="${project.version}",
org.wso2.financial.services.accelerator.consent.mgt.dao.*;version="${project.version}",
- org.wso2.financial.services.accelerator.consent.mgt.service.*;version="${project.version}",
-
-
+ org.wso2.financial.services.accelerator.consent.mgt.service.*;version="${project.version}"
*
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/EventNotificationProducerService.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/EventNotificationProducerService.java
index e86462f5..54692e26 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/EventNotificationProducerService.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/EventNotificationProducerService.java
@@ -20,6 +20,7 @@
import com.nimbusds.jose.JOSEException;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
@@ -78,7 +79,7 @@ public void run() {
}
});
- if (!allowedEvents.isEmpty()) {
+ if (!allowedEvents.isEmpty() && StringUtils.isNotEmpty(subscription.getCallbackUrl())) {
RealtimeEventNotification realtimeEventNotification = new RealtimeEventNotification();
realtimeEventNotification.setNotification(notification);
realtimeEventNotification.setCallbackUrl(subscription.getCallbackUrl());
diff --git a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/RealtimeEventNotificationLoaderService.java b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/RealtimeEventNotificationLoaderService.java
index d4e069f3..01fd2e64 100644
--- a/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/RealtimeEventNotificationLoaderService.java
+++ b/financial-services-accelerator/components/org.wso2.financial.services.accelerator.event.notifications.service/src/main/java/org/wso2/financial/services/accelerator/event/notifications/service/realtime/service/RealtimeEventNotificationLoaderService.java
@@ -10,6 +10,7 @@
package org.wso2.financial.services.accelerator.event.notifications.service.realtime.service;
import com.nimbusds.jose.JOSEException;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception;
@@ -71,7 +72,7 @@ public void run() {
}
});
- if (!allowedEvents.isEmpty()) {
+ if (!allowedEvents.isEmpty() && StringUtils.isNotEmpty(subscription.getCallbackUrl())) {
NotificationResponse responseNotification = eventNotificationGenerator.
generateEventNotificationBody(notification, allowedEvents);
RealtimeEventNotification realtimeEventNotification = new RealtimeEventNotification();