Browse Source
Merge pull request #13564 from dashevchenko/resource_version_npe
Fixed NPE when load resource version
pull/13575/head
Viacheslav Klimov
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
1 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java
|
|
|
@ -66,7 +66,7 @@ public class ResourceImportService extends BaseEntityImportService<TbResourceId, |
|
|
|
protected void cleanupForComparison(TbResource resource) { |
|
|
|
super.cleanupForComparison(resource); |
|
|
|
resource.setSearchText(null); |
|
|
|
if (resource.getDescriptor().isNull()) { |
|
|
|
if (resource.getDescriptor() != null && resource.getDescriptor().isNull()) { |
|
|
|
resource.setDescriptor(null); |
|
|
|
} |
|
|
|
} |
|
|
|
|
