diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java
index 0d8e6f3..0b8e992 100644
--- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java
+++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java
@@ -282,14 +282,14 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler {
throw new IllegalArgumentException(e.getMessage());
}
List<TsKvEntry> entries = new ArrayList<>();
- if (entries.isEmpty()) {
- throw new IllegalArgumentException("No timeseries data found in request body!");
- }
for (Map.Entry<Long, List<KvEntry>> entry : telemetryRequest.getData().entrySet()) {
for (KvEntry kv : entry.getValue()) {
entries.add(new BasicTsKvEntry(entry.getKey(), kv));
}
}
+ if (entries.isEmpty()) {
+ throw new IllegalArgumentException("No timeseries data found in request body!");
+ }
ctx.saveTsData(entityId, entries, ttl, new PluginCallback<Void>() {
@Override
public void onSuccess(PluginContext ctx, Void value) {
