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/10/07 22:34:04 UTC
[3/5] tinkerpop git commit: Expanded ternary operator on Line 260
into if then else
Expanded ternary operator on Line 260 into if then else
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f364a37f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f364a37f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f364a37f
Branch: refs/heads/master
Commit: f364a37f94e568bca368282ad0a3fd2784864139
Parents: 3202db1
Author: Vivek Krishnan <vi...@microsoft.com>
Authored: Wed Sep 28 15:35:34 2016 -0700
Committer: Vivek Krishnan <vi...@microsoft.com>
Committed: Wed Sep 28 15:35:34 2016 -0700
----------------------------------------------------------------------
.../server/handler/HttpGremlinEndpointHandler.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f364a37f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
index 96861bb..899d488 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/HttpGremlinEndpointHandler.java
@@ -252,11 +252,12 @@ public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter {
}
}));
- evalFuture.exceptionally(t -> {
-
- String errorMessage = (t.getMessage() != null) ? t.getMessage() :
- String.format("Error encountered evaluating script: %s", requestArguments.getValue0());
- sendError(ctx, INTERNAL_SERVER_ERROR, errorMessage, Optional.of(t));
+ evalFuture.exceptionally(t -> {
+ if (t.getMessage() != null)
+ sendError(ctx, INTERNAL_SERVER_ERROR, t.getMessage(), Optional.of(t));
+ else
+ sendError(ctx, INTERNAL_SERVER_ERROR, String.format("Error encountered evaluating script: %s", requestArguments.getValue0())
+ , Optional.of(t));
promise.setFailure(t);
return null;
});
@@ -460,7 +461,6 @@ public class HttpGremlinEndpointHandler extends ChannelInboundHandlerAdapter {
node.put("Exception-Class", t.get().getClass().getName());
}
-
final FullHttpResponse response = new DefaultFullHttpResponse(
HTTP_1_1, status, Unpooled.copiedBuffer(node.toString(), CharsetUtil.UTF_8));
response.headers().set(CONTENT_TYPE, "application/json");