[unomi] branch master updated: UNOMI-329 Date comparisons don't work properly in rule conditions (#149)

[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 10678df  UNOMI-329 Date comparisons don't work properly in rule 
conditions (#149)
10678df is described below

commit 10678df8ada5b8ad0d8bca8de63665eb7722b274
Author: Serge Huber <shu...@jahia.com>
AuthorDate: Tue Apr 28 18:56:18 2020 +0200

    UNOMI-329 Date comparisons don't work properly in rule conditions (#149)
    
    Fixed using proper conversion of instant to date
---
 .../unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
index bb42aeb..2b5d7f1 100644
--- 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
+++ 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
@@ -409,7 +409,7 @@ public class PropertyConditionEvaluator implements 
ConditionEvaluator {
         } else {
             JodaDateMathParser parser = new 
JodaDateMathParser(Joda.forPattern("strictDateOptionalTime||epoch_millis"));
             try {
-                return new Date(parser.parse(value.toString(), 
System::currentTimeMillis).getEpochSecond());
+                return Date.from(parser.parse(value.toString(), 
System::currentTimeMillis));
             } catch (ElasticsearchParseException e) {
                 logger.warn("unable to parse date " + value.toString(), e);
             }