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
commit 720e8166400c33570c26fda5536c12b242e2602f Merge: efe140f c52d264 Author: Stephen Mallette <sp...@genoprime.com> AuthorDate: Mon Jun 3 16:40:02 2019 -0400 Merge branch 'tp33' into tp34 CHANGELOG.asciidoc | 1 + .../gremlin/structure/io/graphml/GraphMLWriter.java | 18 ++++++++++++++++-- .../apache/tinkerpop/gremlin/structure/io/IoTest.java | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java index cc66d37,21fe416..59812f0 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java @@@ -329,14 -309,12 +329,17 @@@ public final class GraphMLWriter implem for (String key : keys) { writer.writeStartElement(GraphMLTokens.DATA); - writer.writeAttribute(GraphMLTokens.KEY, key); + if (intersection != null && intersection.contains(key)) { + writer.writeAttribute(GraphMLTokens.KEY, key.concat(GraphMLTokens.VERTEX_SUFFIX)); + } else { + writer.writeAttribute(GraphMLTokens.KEY, key); + } ++ + final VertexProperty<Object> currentValue = getCheckedVertexProperty(vertex, key); + // technically there can't be a null here as gremlin structure forbids that occurrence even if Graph // implementations support it, but out to empty string just in case. - writer.writeCharacters(vertex.property(key).orElse("").toString()); + writer.writeCharacters(currentValue.orElse("").toString()); writer.writeEndElement(); } writer.writeEndElement();