diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java index 7a2ad3dfb3f..e836568d73d 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java @@ -112,7 +112,7 @@ public static Builder build(final String op) { */ public static final class Builder { public static final String OP_PROCESSOR_NAME = ""; - private UUID requestId = UUID.randomUUID(); + private UUID requestId; private String op; private String processor = OP_PROCESSOR_NAME; private Map args = new HashMap<>(); @@ -155,7 +155,7 @@ public Builder add(final Object... keyValues) { * Create the request message given the settings provided to the {@link Builder}. */ public RequestMessage create() { - return new RequestMessage(requestId, op, processor, args); + return new RequestMessage(requestId == null ? UUID.randomUUID() : requestId, op, processor, args); } }