Correct a merge conflict from #3123

deephaven · Dec 5, 2022 · 35efc89 · 35efc89
1 parent 5d4b79b
commit 35efc89
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
@@ -260,10 +260,10 @@ public void bindTableToVariable(BindTableToVariableRequest request,
     public StreamObserver<AutoCompleteRequest> autoCompleteStream(
             StreamObserver<AutoCompleteResponse> responseObserver) {
         return GrpcUtil.rpcWrapper(log, responseObserver, () -> {
+            final SessionState session = sessionService.getCurrentSession();
             if (AUTOCOMPLETE_DISABLED) {
-                return new NoopAutoCompleteObserver(responseObserver);
+                return new NoopAutoCompleteObserver(session, responseObserver);
             }
-            final SessionState session = sessionService.getCurrentSession();
             if (PythonDeephavenSession.SCRIPT_TYPE.equals(scriptSessionProvider.get().scriptType())) {
                 PyObject[] settings = new PyObject[1];
                 safelyExecute(() -> {