Browse Source
Merge pull request #7676 from YevhenBondarenko/fix/version-control
[3.4.2] fixed import assets with the same type without assetProfileId
pull/7687/head
Andrew Shvayka
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
|
|
|
@ -95,7 +95,7 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr |
|
|
|
log.trace("Executing findAssetProfileByName [{}][{}]", tenantId, profileName); |
|
|
|
Validator.validateString(profileName, INCORRECT_ASSET_PROFILE_NAME + profileName); |
|
|
|
return cache.getAndPutInTransaction(AssetProfileCacheKey.fromName(tenantId, profileName), |
|
|
|
() -> assetProfileDao.findByName(tenantId, profileName), true); |
|
|
|
() -> assetProfileDao.findByName(tenantId, profileName), false); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
