From 0a2255d0557f8881bc0f6d95bb6a085762fa2989 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Mon, 21 Dec 2020 15:46:16 +0200
Subject: [PATCH] move SettableFuture.create() to the else block

---
 .../server/dao/timeseries/CassandraBaseTimeseriesDao.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<Boolean> hasInCacheFuture = cassandraTsPartitionsCache.has(partitionSearchKey);
-            SettableFuture<Void> futureResult = SettableFuture.create();
             if (hasInCacheFuture == null) {
                 return doSavePartitionWithCache(tenantId, entityId, key, partition, partitionSearchKey, ttl);
             } else {
                 long finalTtl = ttl;
+                SettableFuture<Void> futureResult = SettableFuture.create();
                 hasInCacheFuture.whenComplete((result, throwable) -> {
                     if (throwable != null) {
                         futureResult.setException(throwable);