[unomi] branch master updated: Fix cases where property is in Date format.

[shuber]

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/master by this push:
     new 16eaa37  Fix cases where property is in Date format.
16eaa37 is described below

commit 16eaa37ebbd2ad23493cf98a642afaf896a1674e
Author: Serge Huber <shu...@apache.org>
AuthorDate: Fri May 29 17:12:47 2020 +0200

    Fix cases where property is in Date format.
---
 .../unomi/plugins/baseplugin/actions/SetPropertyAction.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
index d65e649..1e89e0b 100644
--- 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
+++ 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetPropertyAction.java
@@ -78,9 +78,15 @@ public class SetPropertyAction implements ActionExecutor {
             Date firstVisit = new Date();
 
             try {
-                String propertyFirstVisit = (String) 
event.getProfile().getProperties().get("firstVisit");
+                Object propertyFirstVisit = 
event.getProfile().getProperties().get("firstVisit");
                 if (propertyFirstVisit != null) {
-                    firstVisit = format.parse(propertyFirstVisit);
+                    if (propertyFirstVisit instanceof String) {
+                        firstVisit = format.parse((String) propertyFirstVisit);
+                    } else if (propertyFirstVisit instanceof Date) {
+                        firstVisit = (Date) propertyFirstVisit;
+                    } else {
+                        firstVisit = 
format.parse(propertyFirstVisit.toString());
+                    }
                 }
 
                 if (event.getTimeStamp().after(firstVisit)) {