Merge pull request #2355 from telefonicaid/fix/check_get_lastdata_bef…

…ore_remove Fix/check get lastdata before remove
telefonicaid · Mar 8, 2024 · 93f11cb · 93f11cb
2 parents 02198b4 + dd60680
commit 93f11cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -0,0 +1 @@
+- [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities)
diff --git a/...ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java b/...ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java
@@ -244,7 +244,10 @@ public void aggregate(NGSIEvent event) {
                             if (storedTS < currentTS) {
                                 ArrayList<String> keys = new ArrayList<>(aggregation.keySet());
                                 for (int j = 0 ; j < keys.size() ; j++) {
-                                    lastData.get(keys.get(j)).remove(i);
+                                    ArrayList<JsonElement> lst = lastData.get(keys.get(j));
+                                    if (lst != null) {
+                                        lst.remove(i);
+                                    }
                                 }
                                 updateLastData = true;
                                 break;