[GS] fixes possible exception when client disconnects - ci release

gama-platform · Aug 4, 2023 · 30ab9f1 · 30ab9f1
1 parent fa1baf5
commit 30ab9f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/msi.gama.headless/src/msi/gama/headless/listener/GamaWebSocketServer.java b/msi.gama.headless/src/msi/gama/headless/listener/GamaWebSocketServer.java
@@ -159,8 +159,7 @@ public void onOpen(final WebSocket conn, final ClientHandshake handshake) {
 		// conn.getRemoteSocketAddress().getAddress().getHostAddress() + " to the
 		// server!");
 		// broadcast("new connection: " + handshake.getResourceDescriptor()); // This
-		// method sends a message to all clients connected
-		DEBUG.OUT(conn.getRemoteSocketAddress().getAddress().getHostAddress() + " entered the room!");
+		// method sends a message to all clients connected		DEBUG.OUT(conn.getRemoteSocketAddress().getAddress().getHostAddress() + " entered the room!");
 		conn.send(Jsoner
 				.serialize(new GamaServerMessage(GamaServerMessageType.ConnectionSuccessful, "" + conn.hashCode())));
 
@@ -169,7 +168,9 @@ public void onOpen(final WebSocket conn, final ClientHandshake handshake) {
 			timer.scheduleAtFixedRate(new TimerTask() {
 				@Override
 				public void run() {
-					conn.sendPing();
+					if (conn.isOpen()) {
+						conn.sendPing();						
+					}
 				}
 			}, 0, pingInterval);
 			pingTimers.put(conn, timer);			

diff --git a/msi.gama.headless/src/msi/gama/headless/listener/UploadCommand.java b/msi.gama.headless/src/msi/gama/headless/listener/UploadCommand.java
@@ -22,7 +22,7 @@ public CommandResponse execute(final WebSocket socket, final IMap<String, Object
 		}
 
 		try (FileWriter myWriter = new FileWriter(filepath)) {
-			myWriter.write("" + content);
+			myWriter.write(content);
 			return new CommandResponse(GamaServerMessageType.CommandExecutedSuccessfully, "", map, false);
 		} catch (Exception ex) {
 			ex.printStackTrace();