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/06/30 01:17:39 UTC

[1/2] incubator-tinkerpop git commit: when an exception occurs in Console, set the tempIterator to Collections.emptyIterator(). This makes it so only one :clear is ever needed.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 8c658ce74 -> fe61a67e0


when an exception occurs in Console, set the tempIterator to Collections.emptyIterator(). This makes it so only one :clear is ever needed.


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

Branch: refs/heads/master
Commit: b9111c88e3f65c3b6366116a8c4d1f11c5eebdb7
Parents: 8c658ce
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 29 15:26:31 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 29 15:26:41 2015 -0600

----------------------------------------------------------------------
 .../main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b9111c88/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 9a963e3..acf613f 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -237,6 +237,7 @@ class Console {
     }
 
     private def handleError = { err ->
+        this.tempIterator = Collections.emptyIterator();
         if (err instanceof Throwable) {
             try {
                 final Throwable e = (Throwable) err


[2/2] incubator-tinkerpop git commit: CHANGELOG update.

Posted by ok...@apache.org.
CHANGELOG update.


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

Branch: refs/heads/master
Commit: fe61a67e083686fcb3998b93380b8b4b90148720
Parents: b9111c8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 29 17:17:45 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 29 17:17:45 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fe61a67e/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d5ad856..0f9f98e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -66,7 +66,6 @@ TinkerPop 3.0.0.GA (NOT OFFICIALLY RELEASED YET)
 * Added `LazyBarrierStrategy` which "stalls" a traversal of a particular form in order to gain a bulking optimization.
 * `CollectingBarrierStep` supports `maxBarrierSize` for "lazy barrier," memory conservation.
 * `Scoping` now has `getScopeKeys()` to get the keys desired by the scoping step.
-* `Scope.global` and `Scope.local` both account for traversal side-effects. The distinction is between path and map.
 * Refactored SSL support in the Gremlin Server/Driver.
 * Factored out `ServerGremlinExecutor` which contains the core elements of server-side script execution in Gremlin Server.
 * Bumped to netty 4.0.28.Final.