Merge branch 'vc-fixes' of github.com:ViacheslavKlimov/thingsboard into develop/3.4

application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java

@@ -384,12 +384,12 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
                 } catch (Exception e) {
                     throw new LoadEntityException(entityData, e);
                 }
+                registerResult(ctx, entityType, importResult);
+
                 if (!importResult.isUpdatedAllExternalIds()) {
                     ctx.getToReimport().put(entityData.getEntity().getExternalId(), new ReimportTask(reimportBackup, ctx.getSettings()));
                     continue;
                 }
-
-                registerResult(ctx, entityType, importResult);
                 ctx.getImportedEntities().computeIfAbsent(entityType, t -> new HashSet<>())
                         .add(importResult.getSavedEntity().getId());
             }
@@ -408,7 +408,6 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
                 ctx.setSettings(settings);
                 EntityImportResult<?> importResult = exportImportService.importEntity(ctx, entityData);
 
-                registerResult(ctx, externalId.getEntityType(), importResult);
                 ctx.getImportedEntities().computeIfAbsent(externalId.getEntityType(), t -> new HashSet<>())
                         .add(importResult.getSavedEntity().getId());
             } catch (Exception e) {