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/09/30 00:07:14 UTC

[10/21] incubator-tinkerpop git commit: minor tweaks.

minor tweaks.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/dfd78efa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dfd78efa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dfd78efa

Branch: refs/heads/thread-issue-tinkergraph
Commit: dfd78efa2853db0050a3974b7aebdd556bac0b95
Parents: b4a009c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 28 16:59:12 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Sep 28 16:59:12 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                                | 2 +-
 .../spark/structure/io/gryo/GryoDeserializationStream.groovy      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dfd78efa/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4914b1a..01298d3 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.0 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* Added `GryoSerializer` which is a Spark `Serializer` and is the recommend serializer. Handles `Graph` and `GryoMapper` registries.
+* Added `GryoSerializer` as the new recommended Spark `Serializer`. Handles `Graph` and `GryoMapper` registries.
 * `GryoPool` now makes use of `GryoPool.Builder` for its construction.
 * Bumped to Apache Hadoop 2.7.1.
 * Bumped to Apache Giraph 1.1.0.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dfd78efa/spark-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoDeserializationStream.groovy
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoDeserializationStream.groovy b/spark-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoDeserializationStream.groovy
index 6c6296d..b212dcf 100644
--- a/spark-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoDeserializationStream.groovy
+++ b/spark-gremlin/src/main/groovy/org/apache/tinkerpop/gremlin/spark/structure/io/gryo/GryoDeserializationStream.groovy
@@ -32,6 +32,7 @@ public final class GryoDeserializationStream extends DeserializationStream {
 
     private final Input input;
     private final GryoSerializerInstance gryoSerializer;
+    private static final String BUFFER_UNDERFLOW = "buffer underflow";
 
     public GryoDeserializationStream(final GryoSerializerInstance gryoSerializer, final InputStream inputStream) {
         this.gryoSerializer = gryoSerializer;
@@ -48,7 +49,7 @@ public final class GryoDeserializationStream extends DeserializationStream {
         } catch (final Throwable e) {
             if (e instanceof KryoException) {
                 final KryoException kryoException = (KryoException) e;
-                if (kryoException.getMessage().toLowerCase().contains("buffer underflow")) {
+                if (kryoException.getMessage().toLowerCase().contains(BUFFER_UNDERFLOW)) {
                     throw new EOFException();
                 }
             }