You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dr...@apache.org on 2017/11/07 10:45:07 UTC
incubator-unomi git commit: UNOMI-134 : Fixed test on condition
validity
Repository: incubator-unomi
Updated Branches:
refs/heads/master 7b19dfa06 -> 94253a952
UNOMI-134 : Fixed test on condition validity
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/94253a95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/94253a95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/94253a95
Branch: refs/heads/master
Commit: 94253a95212991d0eb1e78f5b2d3863519e5efe8
Parents: 7b19dfa
Author: Thomas Draier <dr...@apache.org>
Authored: Tue Nov 7 11:44:57 2017 +0100
Committer: Thomas Draier <dr...@apache.org>
Committed: Tue Nov 7 11:45:05 2017 +0100
----------------------------------------------------------------------
.../apache/unomi/services/services/PersonalizationServiceImpl.java | 2 +-
.../apache/unomi/services/sorts/ScorePersonalizationStrategy.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/94253a95/services/src/main/java/org/apache/unomi/services/services/PersonalizationServiceImpl.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/services/PersonalizationServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/PersonalizationServiceImpl.java
index f968bf5..199b529 100644
--- a/services/src/main/java/org/apache/unomi/services/services/PersonalizationServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/services/PersonalizationServiceImpl.java
@@ -62,7 +62,7 @@ public class PersonalizationServiceImpl implements PersonalizationService {
boolean result = true;
for (Filter filter : personalizedContent.getFilters()) {
Condition condition = filter.getCondition();
- if (condition.getConditionType() != null) {
+ if (condition != null && condition.getConditionTypeId() != null) {
result &= profileService.matchCondition(condition, profile, session);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/94253a95/services/src/main/java/org/apache/unomi/services/sorts/ScorePersonalizationStrategy.java
----------------------------------------------------------------------
diff --git a/services/src/main/java/org/apache/unomi/services/sorts/ScorePersonalizationStrategy.java b/services/src/main/java/org/apache/unomi/services/sorts/ScorePersonalizationStrategy.java
index bc90bf0..c8d391b 100644
--- a/services/src/main/java/org/apache/unomi/services/sorts/ScorePersonalizationStrategy.java
+++ b/services/src/main/java/org/apache/unomi/services/sorts/ScorePersonalizationStrategy.java
@@ -69,7 +69,7 @@ public class ScorePersonalizationStrategy implements PersonalizationStrategy {
for (PersonalizationService.Filter filter : personalizedContent.getFilters()) {
Condition condition = filter.getCondition();
- if (condition.getConditionType() != null) {
+ if (condition != null && condition.getConditionTypeId() != null) {
if (profileService.matchCondition(condition, profile, session)) {
if (filter.getProperties().get("score") != null) {
score += (int) filter.getProperties().get("score");