Hotfix GLSPDiagramServer

eclipse-glsp · Aug 25, 2020 · cd80fce · cd80fce
1 parent bcb2940
commit cd80fce
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/model-source/glsp-diagram-server.ts b/src/model-source/glsp-diagram-server.ts
@@ -67,10 +67,11 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
     protected _glspClient?: GLSPClient;
     protected ready = false;
 
-    async connect(client: GLSPClient) {
+    async connect(client: GLSPClient): Promise<GLSPClient> {
         await client.start();
         client.onActionMessage(message => this.messageReceived(message));
         this._glspClient = client;
+        return this._glspClient;
     }
 
     public get glspClient(): GLSPClient | undefined {
@@ -87,7 +88,8 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
 
     initialize(registry: ActionHandlerRegistry): void {
         registerDefaultGLSPServerActions(registry, this);
-        this.clientId = this.viewerOptions.baseDiv;
+        if (!this.clientId)
+            this.clientId = this.viewerOptions.baseDiv;
     }
 
     handle(action: Action): void | ICommand | Action {