X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=acs%2Frequestprocessor%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Facs%2Frequestprocessor%2Fimpl%2FTR069EventNotificationService.java;fp=acs%2Frequestprocessor%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Facs%2Frequestprocessor%2Fimpl%2FTR069EventNotificationService.java;h=634f9df105dcae18b4ed5d407a440ab005ae3336;hb=641a6c47b4ee74412e9386b3c95693adda3cafc9;hp=b6025f0bbbadd1436ff0255a614ce82db3be2789;hpb=8c7432b8380a355e89df05f070e7d88e599912fd;p=oam%2Ftr069-adapter.git

diff --git a/acs/requestprocessor/src/main/java/org/commscope/tr069adapter/acs/requestprocessor/impl/TR069EventNotificationService.java b/acs/requestprocessor/src/main/java/org/commscope/tr069adapter/acs/requestprocessor/impl/TR069EventNotificationService.java
index b6025f0..634f9df 100644
--- a/acs/requestprocessor/src/main/java/org/commscope/tr069adapter/acs/requestprocessor/impl/TR069EventNotificationService.java
+++ b/acs/requestprocessor/src/main/java/org/commscope/tr069adapter/acs/requestprocessor/impl/TR069EventNotificationService.java
@@ -23,6 +23,7 @@ import static org.commscope.tr069adapter.acs.common.utils.AcsConstants.NBI_OP_RE
 
 import org.commscope.tr069adapter.acs.common.DeviceInform;
 import org.commscope.tr069adapter.acs.common.DeviceRPCResponse;
+import org.commscope.tr069adapter.acs.common.dto.CustomOperationCode;
 import org.commscope.tr069adapter.acs.common.dto.TR069InformType;
 import org.commscope.tr069adapter.acs.common.dto.TR069OperationCode;
 import org.slf4j.Logger;
@@ -68,11 +69,19 @@ public class TR069EventNotificationService {
     String deviceId = deviceRPCResponse.getDeviceDetails().getDeviceId();
     try {
       MDC.put(CLIENT_STR, deviceId);
-      TR069OperationCode operCode =
-          (TR069OperationCode) deviceRPCResponse.getOperationResponse().getOperationCode();
-      String opCodeName = operCode.name();
-      logger.debug("Device RPC Response received for operation: '{}' with operation ID: {}",
-          opCodeName, deviceRPCResponse.getOperationId());
+      if (deviceRPCResponse.getOperationResponse()
+          .getOperationCode() instanceof TR069OperationCode) {
+        TR069OperationCode operCode =
+            (TR069OperationCode) deviceRPCResponse.getOperationResponse().getOperationCode();
+        logger.debug("Device RPC Response received for operation: '" + operCode.name()
+            + "' with operation ID:" + deviceRPCResponse.getOperationId());
+      } else if (deviceRPCResponse.getOperationResponse()
+          .getOperationCode() instanceof CustomOperationCode) {
+        CustomOperationCode operCode =
+            (CustomOperationCode) deviceRPCResponse.getOperationResponse().getOperationCode();
+        logger.debug("Device RPC Response received for operation: '" + operCode.getJndiName()
+            + "' with operation ID:" + deviceRPCResponse.getOperationId());
+      }
       jmsTemplate.convertAndSend(NBI_OP_RESULT_Q, deviceRPCResponse);
       logger.debug("Successfully posted the operation result event to DM to forward to NBI");
     } catch (Exception e) {