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/04/02 21:47:41 UTC
incubator-tinkerpop git commit: added PGP plugin to tinkerpop main
pom.xml. Fixed an NPE issue with Spark BSP.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 90364ccb0 -> 11ddbf388
added PGP plugin to tinkerpop main pom.xml. Fixed an NPE issue with Spark BSP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/11ddbf38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/11ddbf38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/11ddbf38
Branch: refs/heads/master
Commit: 11ddbf388727570edcbda6d410753024308f2d66
Parents: 90364cc
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 2 13:47:39 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 2 13:47:39 2015 -0600
----------------------------------------------------------------------
.../spark/payload/ViewIncomingPayload.java | 4 ++--
pom.xml | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/11ddbf38/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/payload/ViewIncomingPayload.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/payload/ViewIncomingPayload.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/payload/ViewIncomingPayload.java
index 772052e..7e149b2 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/payload/ViewIncomingPayload.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/payload/ViewIncomingPayload.java
@@ -71,8 +71,8 @@ public class ViewIncomingPayload<M> implements Payload {
}
private void mergeViewIncomingPayload(final ViewIncomingPayload<M> viewIncomingPayload, final MessageCombiner<M> messageCombiner) {
- if (this.view == null && !viewIncomingPayload.getView().isEmpty())
- this.view = viewIncomingPayload.getView();
+ if (this.view == null)
+ this.view = viewIncomingPayload.view;
else
this.view.addAll(viewIncomingPayload.getView());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/11ddbf38/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a33ff27..6e9a6f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,23 @@ limitations under the License.
</extensions>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>