1 files changed, 21 insertions, 5 deletions

diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
index 043d318c..1fde1be5 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/servlet/XtextWebSocket.java
@@ -6,6 +6,7 @@
 package tools.refinery.language.web.xtext.servlet;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonParseException;
 import org.eclipse.jetty.websocket.api.Callback;
@@ -16,6 +17,7 @@ import org.eclipse.xtext.resource.IResourceServiceProvider;
 import org.eclipse.xtext.web.server.ISession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import tools.refinery.language.semantics.metadata.*;
 import tools.refinery.language.web.xtext.server.ResponseHandler;
 import tools.refinery.language.web.xtext.server.ResponseHandlerException;
 import tools.refinery.language.web.xtext.server.TransactionExecutor;
@@ -28,7 +30,15 @@ import java.io.Reader;
 public class XtextWebSocket implements ResponseHandler {
         private static final Logger LOG = LoggerFactory.getLogger(XtextWebSocket.class);
 
-        private final Gson gson = new Gson();
+        private final Gson gson = new GsonBuilder()
+                        .disableJdkUnsafe()
+                        .registerTypeAdapterFactory(RuntimeTypeAdapterFactory.of(RelationDetail.class, "type")
+                                        .registerSubtype(ClassDetail.class, "class")
+                                        .registerSubtype(ReferenceDetail.class, "reference")
+                                        .registerSubtype(OppositeReferenceDetail.class, "opposite")
+                                        .registerSubtype(PredicateDetail.class, "predicate")
+                                        .registerSubtype(BuiltInDetail.class, "builtin"))
+                        .create();
 
         private final TransactionExecutor executor;
 
@@ -70,10 +80,11 @@ public class XtextWebSocket implements ResponseHandler {
 
         @OnWebSocketError
         public void onError(Throwable error) {
+                executor.dispose();
                 if (webSocketSession == null) {
                         return;
                 }
-                LOG.error("Internal websocket error in connection from" + webSocketSession.getRemoteSocketAddress(), error);
+                LOG.error("Internal websocket error in connection from " + webSocketSession.getRemoteSocketAddress(), error);
         }
 
         @OnWebSocketMessage
@@ -86,14 +97,18 @@ public class XtextWebSocket implements ResponseHandler {
                 try {
                         request = gson.fromJson(reader, XtextWebRequest.class);
                 } catch (JsonIOException e) {
-                        LOG.error("Cannot read from websocket from" + webSocketSession.getRemoteSocketAddress(), e);
+                        LOG.error("Cannot read from websocket from " + webSocketSession.getRemoteSocketAddress(), e);
                         if (webSocketSession.isOpen()) {
+                                executor.dispose();
                                 webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot read payload", Callback.NOOP);
                         }
                         return;
                 } catch (JsonParseException e) {
-                        LOG.warn("Malformed websocket request from" + webSocketSession.getRemoteSocketAddress(), e);
-                        webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload", Callback.NOOP);
+                        LOG.warn("Malformed websocket request from " + webSocketSession.getRemoteSocketAddress(), e);
+                        if (webSocketSession.isOpen()) {
+                                executor.dispose();
+                                webSocketSession.close(XtextStatusCode.INVALID_JSON, "Invalid JSON payload", Callback.NOOP);
+                        }
                         return;
                 }
                 try {
@@ -101,6 +116,7 @@ public class XtextWebSocket implements ResponseHandler {
                 } catch (ResponseHandlerException e) {
                         LOG.warn("Cannot write websocket response", e);
                         if (webSocketSession.isOpen()) {
+                                executor.dispose();
                                 webSocketSession.close(StatusCode.SERVER_ERROR, "Cannot write response", Callback.NOOP);
                         }
                 }