From f994f41186b4a7421a587219b114271a09027adf Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Thu, 27 May 2021 12:38:03 +0300 Subject: [PATCH 1/2] added missing 3.2.2 switch cases to database ts upgrade services --- .../service/install/CassandraTsDatabaseUpgradeService.java | 1 + .../service/install/TimescaleTsDatabaseUpgradeService.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java index 0a64a59a08..87af6155e1 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseUpgradeService.java @@ -51,6 +51,7 @@ public class CassandraTsDatabaseUpgradeService extends AbstractCassandraDatabase case "2.5.0": case "3.1.1": case "3.2.1": + case "3.2.2": break; default: throw new RuntimeException("Unable to upgrade Cassandra database, unsupported fromVersion: " + fromVersion); diff --git a/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java index 417e3f8f1a..40e714d411 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java @@ -184,6 +184,8 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "3.2.1"); } break; + case "3.2.2": + break; default: throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion); } From 4f6ef2f2446b4b6ff1a8e41809bcebee53070346 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 27 May 2021 13:05:50 +0300 Subject: [PATCH 2/2] NullPointer exception fix --- .../thingsboard/server/service/edge/rpc/EdgeGrpcService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java index 70033f10e1..ab0857f863 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java @@ -172,7 +172,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i @Override public void onEdgeEvent(EdgeId edgeId) { log.trace("[{}] onEdgeEvent", edgeId.getId()); - if (!sessionNewEvents.get(edgeId)) { + if (Boolean.FALSE.equals(sessionNewEvents.get(edgeId))) { log.trace("[{}] set session new events flag to true", edgeId.getId()); sessionNewEvents.put(edgeId, true); } @@ -204,7 +204,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i if (sessions.containsKey(edgeId)) { ScheduledFuture schedule = scheduler.schedule(() -> { try { - if (sessionNewEvents.get(edgeId)) { + if (Boolean.TRUE.equals(sessionNewEvents.get(edgeId))) { log.trace("[{}] Set session new events flag to false", edgeId.getId()); sessionNewEvents.put(edgeId, false); session.processEdgeEvents();