Fix NPE in monthly index creation
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/12641b9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/12641b9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/12641b9b Branch: refs/heads/UNOMI-28-ES-2-X-UPGRADE Commit: 12641b9b3e72b130a5f05062680238cd4ca8a15f Parents: 91c9c20 Author: Serge Huber <shu...@apache.org> Authored: Wed Sep 21 13:55:25 2016 +0200 Committer: Serge Huber <shu...@apache.org> Committed: Wed Sep 21 13:55:25 2016 +0200 ---------------------------------------------------------------------- .../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/12641b9b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java index 34c0d9f..b5f1c7a 100644 --- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java +++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java @@ -572,8 +572,13 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService, indexBuilder.execute().actionGet(); } catch (IndexNotFoundException e) { if (itemsMonthlyIndexed.contains(itemType)) { - getMonthlyIndex(((TimestampedItem) item).getTimeStamp(), true); - indexBuilder.execute().actionGet(); + Date timeStamp = ((TimestampedItem) item).getTimeStamp(); + if (timeStamp != null) { + getMonthlyIndex(timeStamp, true); + indexBuilder.execute().actionGet(); + } else { + logger.warn("Missing time stamp on item " + item + " id=" + item.getItemId() + " can't create related monthly index !"); + } } } return true;
