Merge branch 'develop' of https://github.com/apache/predictionio into…

… develop
dmc-at-work · Jul 22, 2019 · a9e12de · a9e12de
2 parents 92cab7a + d5b5ad5
commit a9e12de
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/data/src/main/scala/org/apache/predictionio/data/store/python/PPythonEventStore.scala b/data/src/main/scala/org/apache/predictionio/data/store/python/PPythonEventStore.scala
@@ -82,8 +82,17 @@ object PPythonEventStore {
       Option(entityType),
       Option(entityId),
       Option(eventNames),
-      Option(Option(targetEntityType)),
-      Option(Option(targetEntityId)))(spark.sparkContext).map { e =>
+      targetEntityType match {
+        case null => None
+        case "" => Option(None)
+        case _ => Option(Option(targetEntityType))
+      },
+      targetEntityId match {
+        case null => None
+        case "" => Option(None)
+        case _ => Option(Option(targetEntityId))
+      }
+      )(spark.sparkContext).map { e =>
       (
         e.eventId,
         e.event,