diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index e69de29bb..be5fff215 100644 --- 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/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java index 5e75c49ea..e031211b9 100644 --- a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java +++ b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java @@ -244,7 +244,10 @@ public void aggregate(NGSIEvent event) { if (storedTS < currentTS) { ArrayList keys = new ArrayList<>(aggregation.keySet()); for (int j = 0 ; j < keys.size() ; j++) { - lastData.get(keys.get(j)).remove(i); + ArrayList lst = lastData.get(keys.get(j)); + if (lst != null) { + lst.remove(i); + } } updateLastData = true; break;