From df1e2a0c51f25956f1299f91141df654c32889d8 Mon Sep 17 00:00:00 2001
From: yevhenii <uman980124@gmail.com>
Date: Tue, 17 Jun 2025 17:49:08 +0300
Subject: [PATCH] [CP-17334] Edge rule chain error

- Skip saving EdgeEvent if edgeId equals originatorEdgeId
---
 .../server/service/edge/rpc/processor/BaseEdgeProcessor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
index 6fcb02e4bc..4eadcfc5e8 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
@@ -219,7 +219,7 @@ public abstract class BaseEdgeProcessor implements EdgeProcessor {
                 case CREDENTIALS_UPDATED:
                 case ASSIGNED_TO_CUSTOMER:
                 case UNASSIGNED_FROM_CUSTOMER:
-                    if (edgeId != null) {
+                    if (edgeId != null && !edgeId.equals(originatorEdgeId)) {
                         return saveEdgeEvent(tenantId, edgeId, type, actionType, entityId, body);
                     } else {
                         return processNotificationToRelatedEdges(tenantId, entityId, type, actionType, originatorEdgeId);