You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/03/25 23:15:26 UTC
incubator-tinkerpop git commit: sometimes a reduce() does not have a
value cause there is nothing in the payload. no messages. be smart about
Optional.get().
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 57214bcc6 -> 8a94e3942
sometimes a reduce() does not have a value cause there is nothing in the payload. no messages. be smart about Optional.get().
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8a94e394
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8a94e394
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8a94e394
Branch: refs/heads/master
Commit: 8a94e3942b9291dcf63c9434b8c1499eea3f02e7
Parents: 57214bc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Mar 25 16:15:24 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Mar 25 16:15:24 2015 -0600
----------------------------------------------------------------------
.../gremlin/hadoop/process/computer/spark/SparkPayload.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8a94e394/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkPayload.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkPayload.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkPayload.java
index 6a6ef92..19c2b7c 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkPayload.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/SparkPayload.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.hadoop.process.computer.spark;
import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Stream;
/**
@@ -30,9 +31,11 @@ public interface SparkPayload<M> {
public default void addMessages(final List<M> otherMessages, final MessageCombiner<M> messageCombiner) {
if (null != messageCombiner) {
- final M combinedMessage = Stream.concat(this.getMessages().stream(), otherMessages.stream()).reduce(messageCombiner::combine).get();
- this.getMessages().clear();
- this.getMessages().add(combinedMessage);
+ final Optional<M> combinedMessage = Stream.concat(this.getMessages().stream(), otherMessages.stream()).reduce(messageCombiner::combine);
+ if (combinedMessage.isPresent()) {
+ this.getMessages().clear();
+ this.getMessages().add(combinedMessage.get());
+ }
} else {
this.getMessages().addAll(otherMessages);
}