You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/01/06 19:14:40 UTC
incubator-tinkerpop git commit: Add protocol to the list of Settings
for the driver.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 46c7189e2 -> b44253d94
Add protocol to the list of Settings for the driver.
This was a minor oversight from previous work where the "protocol" value was not being passed in from yaml file. CTR
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b44253d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b44253d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b44253d9
Branch: refs/heads/master
Commit: b44253d949c0e07e0cd1e1c3568783faaf382a78
Parents: 46c7189
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 6 13:13:44 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 6 13:13:44 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 3 +++
.../main/java/org/apache/tinkerpop/gremlin/driver/Settings.java | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b44253d9/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index ddc6081..c8d3bd6 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -145,6 +145,9 @@ public final class Cluster {
if (settings.jaasEntry != null)
builder.jaasEntry(settings.jaasEntry);
+ if (settings.protocol != null)
+ builder.protocol(settings.protocol);
+
// the first address was added above in the constructor, so skip it if there are more
if (addresses.size() > 1)
addresses.stream().skip(1).forEach(builder::addContactPoint);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b44253d9/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index 7faa377..7a40d4f 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@ -53,6 +53,8 @@ final class Settings {
public String jaasEntry = null;
+ public String protocol = null;
+
/**
* Read configuration from a file into a new {@link Settings} object.
*