Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions common/src/main/java/org/jspace/gate/KeepClientHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;
import java.net.SocketException;

import org.jspace.io.jSpaceMarshaller;
import org.jspace.protocol.ClientMessage;
Expand Down Expand Up @@ -59,7 +60,12 @@ public KeepClientHandler(jSpaceMarshaller marshaller, Socket client) throws IOEx
*/
@Override
public ClientMessage receive() throws IOException {
ClientMessage message = marshaller.read(ClientMessage.class, reader);
ClientMessage message = null;
try {
message = marshaller.read(ClientMessage.class, reader);
} catch (SocketException e) {
// It's okay, just below we will set isActive to false, since the message is null
}
isActive = (message != null);
return message;
}
Expand Down Expand Up @@ -96,5 +102,7 @@ public boolean isClosed() {
return isClosed;
}


}