- if (!pollingTasks.containsKey(subscriber.getTopic())) {
- DMaaPAlarmPolling pollingTask = new DMaaPAlarmPolling(subscriber, droolsEngine);
+ String topic = subscriber.getTopic();
+ if (topic != null) {
+ if (pollingTasks.containsKey(topic)) {
+ removeSubscriber(subscriber);
+ }
+ DMaaPAlarmPolling pollingTask = new DMaaPAlarmPolling(subscriber, droolsEngine, alarmInfoDaoService);