Skip to content

Commit 9052a43

Browse files
committed
Fix wrong exception handling
try-catch block was mistakenly placed out of socket.connect runnable
1 parent 5c054ab commit 9052a43

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

RxSocketClient/src/main/java/moe/codeest/rxsocketclient/SocketObservable.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ class SocketObservable(val mConfig: SocketConfig, val mSocket: Socket) : Observa
4444
observerWrapper = SocketObserver(observer)
4545
observer?.onSubscribe(observerWrapper)
4646

47-
try {
48-
Thread(Runnable {
49-
mSocket.connect(InetSocketAddress(mConfig.mIp, mConfig.mPort?: 1080), mConfig.mTimeout?: 0)
47+
Thread(Runnable {
48+
try {
49+
mSocket.connect(InetSocketAddress(mConfig.mIp, mConfig.mPort ?: 1080), mConfig.mTimeout ?: 0)
5050
observer?.onNext(DataWrapper(SocketState.OPEN, ByteArray(0)))
5151
mReadThread.start()
52-
}).start()
53-
} catch (e: IOException) {
54-
println(e.toString())
55-
observer?.onNext(DataWrapper(SocketState.CLOSE, ByteArray(0)))
56-
}
52+
} catch (e: IOException) {
53+
println(e.toString())
54+
observer?.onNext(DataWrapper(SocketState.CLOSE, ByteArray(0)))
55+
}
56+
}).start()
5757
}
5858

5959
fun setHeartBeatRef(ref: Disposable) {
@@ -102,7 +102,7 @@ class SocketObservable(val mConfig: SocketConfig, val mSocket: Socket) : Observa
102102
observerWrapper.onNext(buffer)
103103
}
104104
}
105-
}catch (e: Exception) {
105+
} catch (e: Exception) {
106106

107107
}
108108
}

0 commit comments

Comments
 (0)