[tinkerpop] branch master updated: Fixed default element label for ReferenceVertex

[spmallette]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/master by this push:
     new e496213  Fixed default element label for ReferenceVertex
     new 5c10f7b  Merge branch 'tp33'
e496213 is described below

commit e496213d63d1a3fb825a915446d480aec3768655
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Nov 20 15:36:34 2018 -0500

    Fixed default element label for ReferenceVertex
    
    Was being set to the default label for VertexProperty rather than the 
default label for a Vertex CTR
---
 CHANGELOG.asciidoc                                                      | 1 +
 .../tinkerpop/gremlin/structure/util/reference/ReferenceElement.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 816ce6e..1a0bee5 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ This release also includes changes from <<release-3-2-11, 
3.2.11>>.
 * Fixed `PersistedOutputRDD` to eager persist RDD by adding `count()` action 
calls.
 * Deserialized `g:Set` to a Python `Set` in GraphSON in `gremlin-python`.
 * Deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and 
`DEFAULT_REQUEST_SERIALIZER`.
+* Fixed the setting of the default label for a `ReferenceVertex` when the 
original vertex was of type `ComputerAdjacentVertex`.
 * Changed Java driver to expect a generic `RemoteTraverser` object rather than 
the specific `DefaultRemoteTraverser`.
 * Display the remote stack trace in the Gremlin Console when scripts sent to 
the server fail.
 * Added `AnonymousTraversalSource` which provides a more unified means of 
constructing a `TraversalSource`.
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
index 1da8144..9ee070d 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/reference/ReferenceElement.java
@@ -47,7 +47,7 @@ public abstract class ReferenceElement<E extends Element> 
implements Element, Se
         try {
             //Exception creation takes too much time, return default values 
for known types
             if (element instanceof ComputerGraph.ComputerAdjacentVertex) {
-                this.label = VertexProperty.DEFAULT_LABEL;
+                this.label = Vertex.DEFAULT_LABEL;
             } else {
                 this.label = element.label();
             }