dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10075 from YevhenBondarenko/fix/stack-overflow

Browse Source 
fixed stack overflow error
This commit is contained in:
Andrew Shvayka 2024-01-30 11:29:46 +02:00 committed by GitHub
commit ac555df9e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
return cachePut(ctx.getRequestId(), result); return cachePut(ctx.getRequestId(), result);
} catch (LoadEntityException e) { } catch (LoadEntityException e) {
return cachePut(ctx.getRequestId(), onError(e.getExternalId(), e.getCause())); 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); log.info("[{}] Failed to process request [{}] due to: ", ctx.getTenantId(), request, e);
return cachePut(ctx.getRequestId(), VersionLoadResult.error(EntityLoadError.runtimeError(e))); return cachePut(ctx.getRequestId(), VersionLoadResult.error(EntityLoadError.runtimeError(e)));
} }

1
application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
View File

@ -237,7 +237,6 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
} }
@Override @Override
public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) { public void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, FutureCallback<Void> callback) {
saveAndNotify(tenantId, entityId, scope, attributes, true, callback); saveAndNotify(tenantId, entityId, scope, attributes, true, callback);
} }

2
dao/src/main/java/org/thingsboard/server/dao/attributes/CachedAttributesService.java
View File

@ -256,7 +256,7 @@ public class CachedAttributesService implements AttributesService {
@Override @Override
public ListenableFuture<List<String>> save(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes) { 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 @Override