From 80252ebeec379a058bb2a74f4211ae0ec9be05cc Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@itemis.de>
Date: Fri, 13 Jan 2017 09:14:18 +0100
Subject: [PATCH] Return Object insteadof null in LanguageServer.shutdown.

Solves #240

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
---
 .../src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend  | 2 +-
 .../org/eclipse/xtext/ide/server/LanguageServerImpl.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
index f7175c53c..a4a6bbf3a 100644
--- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
+++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend
@@ -152,7 +152,7 @@ import org.eclipse.xtext.validation.Issue
 	}
 
 	override CompletableFuture<Object> shutdown() {
-		return CompletableFuture.completedFuture(null);
+		return CompletableFuture.completedFuture(new Object());
 	}
 
 	override TextDocumentService getTextDocumentService() {
diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java
index 3d3fed6e4..883f6d307 100644
--- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java
+++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java
@@ -229,7 +229,8 @@ public class LanguageServerImpl implements LanguageServer, WorkspaceService, Tex
   
   @Override
   public CompletableFuture<Object> shutdown() {
-    return CompletableFuture.<Object>completedFuture(null);
+    Object _object = new Object();
+    return CompletableFuture.<Object>completedFuture(_object);
   }
   
   @Override