Browse Source
Merge pull request #10075 from YevhenBondarenko/fix/stack-overflow
fixed stack overflow error
pull/10129/head
Andrew Shvayka
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
2 additions and
3 deletions
-
application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
-
application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
-
dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
|
|
|
@ -283,7 +283,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont |
|
|
|
return cachePut(ctx.getRequestId(), result); |
|
|
|
} catch (LoadEntityException e) { |
|
|
|
return cachePut(ctx.getRequestId(), onError(e.getExternalId(), e.getCause())); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Throwable e) { |
|
|
|
log.info("[{}] Failed to process request [{}] due to: ", ctx.getTenantId(), request, e); |
|
|
|
return cachePut(ctx.getRequestId(), VersionLoadResult.error(EntityLoadError.runtimeError(e))); |
|
|
|
} |
|
|
|
|
|
|
|
@ -237,7 +237,6 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) { |
|
|
|
saveAndNotify(tenantId, entityId, scope, attributes, true, callback); |
|
|
|
} |
|
|
|
|
|
|
|
@ -256,7 +256,7 @@ public class CachedAttributesService implements AttributesService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) { |
|
|
|
return save(tenantId, entityId, scope, attributes); |
|
|
|
return save(tenantId, entityId, AttributeScope.valueOf(scope), attributes); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|