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/08/29 17:02:11 UTC

[1/2] tinkerpop git commit: fixed empty result

Repository: tinkerpop
Updated Branches:
  refs/heads/master 046243035 -> b49c21d46


fixed empty result


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

Branch: refs/heads/master
Commit: 629ad68865c16b3924e26dcfa940d38ccc6f04cb
Parents: b1afafa
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Aug 27 07:43:10 2016 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Aug 27 07:43:10 2016 -0400

----------------------------------------------------------------------
 .../groovy/org/apache/tinkerpop/gremlin/console/Console.groovy   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/629ad688/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 5645e8d..eeda56d 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
@@ -202,7 +202,7 @@ class Console {
                     final Object object = this.tempIterator.next()
                     String prompt = Colorizer.render(Preferences.resultPromptColor, buildResultPrompt())
                     String colorizedResult = colorizeResult(object)
-                    io.out.println(prompt + ((null == object) ? emptyResult : colorizedResult))
+                    io.out.println(prompt + ((null == object) ? Preferences.emptyResult : colorizedResult))
                     counter++;
                 }
                 if (this.tempIterator.hasNext())
@@ -250,7 +250,7 @@ class Console {
                         io.out.println(Colorizer.render(Preferences.resultPromptColor,(buildResultPrompt() + result.prettyPrint(width < 20 ? 80 : width))))
                         return null
                     } else {
-                        io.out.println(Colorizer.render(Preferences.resultPromptColor,buildResultPrompt()).toString() + ((null == result) ? emptyResult : colorizeResult(result)))
+                        io.out.println(Colorizer.render(Preferences.resultPromptColor,buildResultPrompt()).toString() + ((null == result) ? Preferences.emptyResult : colorizeResult(result)))
                         return null
                     }
                 } catch (final Exception e) {


[2/2] tinkerpop git commit: Merge branch 'pr-391'

Posted by sp...@apache.org.
Merge branch 'pr-391'


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

Branch: refs/heads/master
Commit: b49c21d469d02f89fe1ba0c95c613a9d9b914078
Parents: 0462430 629ad68
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 29 12:55:35 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 29 12:55:35 2016 -0400

----------------------------------------------------------------------
 .../groovy/org/apache/tinkerpop/gremlin/console/Console.groovy   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------