Skip to content

Commit d041265

Browse files
committed
SocketTimeoutException should not cause websockets to disconnect
Signed-off-by: Andrej Krota <andrej.krota@gmail.com>
1 parent f30e10b commit d041265

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

  • org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket
  • org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/websocket

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketReceiver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.InputStream;
2020
import java.io.PipedInputStream;
2121
import java.io.PipedOutputStream;
22+
import java.net.SocketTimeoutException;
2223

2324
import org.eclipse.paho.client.mqttv3.logging.Logger;
2425
import org.eclipse.paho.client.mqttv3.logging.LoggerFactory;
@@ -114,7 +115,8 @@ public void run() {
114115
}
115116

116117
receiving = false;
117-
118+
} catch (SocketTimeoutException ex) {
119+
// Ignore SocketTimeoutException
118120
} catch (IOException ex) {
119121
// Exception occurred whilst reading the stream.
120122
this.stop();

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketReceiver.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.InputStream;
2020
import java.io.PipedInputStream;
2121
import java.io.PipedOutputStream;
22+
import java.net.SocketTimeoutException;
2223

2324
import org.eclipse.paho.mqttv5.client.logging.Logger;
2425
import org.eclipse.paho.mqttv5.client.logging.LoggerFactory;
@@ -115,6 +116,8 @@ public void run() {
115116

116117
receiving = false;
117118

119+
} catch (SocketTimeoutException ex) {
120+
// Ignore SocketTimeoutException
118121
} catch (IOException ex) {
119122
// Exception occurred whilst reading the stream.
120123
this.stop();

0 commit comments

Comments
 (0)