diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index a9671cad6e..46f8b4a5cb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -405,11 +405,11 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } else { CassandraPartitionCacheKey partitionSearchKey = new CassandraPartitionCacheKey(entityId, key, partition); CompletableFuture hasInCacheFuture = cassandraTsPartitionsCache.has(partitionSearchKey); - SettableFuture futureResult = SettableFuture.create(); if (hasInCacheFuture == null) { return doSavePartitionWithCache(tenantId, entityId, key, partition, partitionSearchKey, ttl); } else { long finalTtl = ttl; + SettableFuture futureResult = SettableFuture.create(); hasInCacheFuture.whenComplete((result, throwable) -> { if (throwable != null) { futureResult.setException(throwable);