From 2c3fc140d1cdd36ca473a3bac4d68b5dfb852203 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Wed, 12 Nov 2025 15:34:46 +0200
Subject: [PATCH] fixes after merge

---
 .../org/thingsboard/server/dao/asset/BaseAssetService.java     | 2 +-
 .../thingsboard/server/dao/customer/CustomerServiceImpl.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index 8bbefc59f9..7d8442fd3a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -151,7 +151,7 @@ public class BaseAssetService extends AbstractCachedEntityService<AssetCacheKey,
 
     @Override
     public Asset saveAsset(Asset asset, NameConflictStrategy nameConflictStrategy) {
-        return saveEntity(asset, () -> saveAsset(asset, true, NameConflictStrategy.DEFAULT));
+        return saveEntity(asset, () -> saveAsset(asset, true, nameConflictStrategy));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
index f8d36fe02f..70d20852bd 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
@@ -153,6 +153,9 @@ public class CustomerServiceImpl extends AbstractCachedEntityService<CustomerCac
         return saveEntity(customer, () -> saveCustomer(customer, true, nameConflictStrategy));
     }
 
+    private Customer saveCustomer(Customer customer, boolean doValidate) {
+        return saveCustomer(customer, doValidate, NameConflictStrategy.DEFAULT);
+    }
 
     private Customer saveCustomer(Customer customer, boolean doValidate, NameConflictStrategy nameConflictStrategy) {
         log.trace("Executing saveCustomer [{}]", customer);