From c7274b6139cc509d65626fb1e986a7db1e2a8aa6 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 23 Jul 2021 13:54:07 +0300
Subject: [PATCH] ota package tag improvements

---
 .../org/thingsboard/server/controller/OtaPackageController.java | 1 +
 .../server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
index 153b5b5c93..4c0a55da70 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java
@@ -146,6 +146,7 @@ public class OtaPackageController extends BaseController {
             otaPackage.setType(info.getType());
             otaPackage.setTitle(info.getTitle());
             otaPackage.setVersion(info.getVersion());
+            otaPackage.setTag(info.getTag());
             otaPackage.setAdditionalInfo(info.getAdditionalInfo());
 
             ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
index 8b2b8b1af0..5ce581c223 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/LwM2MClientOtaInfo.java
@@ -75,7 +75,7 @@ public abstract class LwM2MClientOtaInfo<Strategy, State, Result> {
                 } else if (StringUtils.isNotEmpty(targetTag) && targetTag.equals(currentPackageId)) {
                     return false;
                 } else if (StringUtils.isNotEmpty(currentVersion3)) {
-                    if (StringUtils.isNotEmpty(targetTag) && !currentVersion3.contains(targetPackageId)) {
+                    if (StringUtils.isNotEmpty(targetTag) && currentVersion3.contains(targetTag)) {
                         return false;
                     }
                     return !currentVersion3.contains(targetPackageId);