Browse Source
Merge pull request #16038 from AndriiLandiak/fix/align-on-configuration-update-guard-lts-4.3
Compare edge customer before session state is replaced in onConfigurationUpdate
lts-4.3
Viacheslav Klimov
2 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
3 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
|
|
|
@ -33,6 +33,7 @@ import org.thingsboard.server.common.data.StringUtils; |
|
|
|
import org.thingsboard.server.common.data.edge.Edge; |
|
|
|
import org.thingsboard.server.common.data.edge.EdgeEvent; |
|
|
|
import org.thingsboard.server.common.data.edge.EdgeEventType; |
|
|
|
import org.thingsboard.server.common.data.id.CustomerId; |
|
|
|
import org.thingsboard.server.common.data.id.EdgeId; |
|
|
|
import org.thingsboard.server.common.data.id.TenantId; |
|
|
|
import org.thingsboard.server.common.data.kv.AttributeKvEntry; |
|
|
|
@ -243,8 +244,9 @@ public abstract class EdgeGrpcSession implements Closeable { |
|
|
|
public void onConfigurationUpdate(Edge edge) { |
|
|
|
log.debug("[{}] onConfigurationUpdate [{}]", sessionId, edge); |
|
|
|
this.tenantId = edge.getTenantId(); |
|
|
|
CustomerId stateCustomerId = this.edge != null ? this.edge.getCustomerId() : null; |
|
|
|
this.edge = edge; |
|
|
|
if (!this.edge.getCustomerId().equals(edge.getCustomerId())) { |
|
|
|
if (stateCustomerId != null && !stateCustomerId.equals(edge.getCustomerId())) { |
|
|
|
// do not send edge configuration message on customer update
|
|
|
|
// message send by separate flow from assign_to or unassing_from customer
|
|
|
|
return; |
|
|
|
|
