Skip to content

Commit 498d34a

Browse files
authored
Merge pull request #69 from jwdeveloper/develop-1.5.4
Changed isNotClosing to isOpen
2 parents 67e70c3 + 103ed7e commit 498d34a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void onMessage(ByteBuffer bytes) {
6161
} catch (Exception e) {
6262
tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(e));
6363
}
64-
if (isNotClosing()) {
64+
if (isOpen()) {
6565
sendPing();
6666
}
6767
}
@@ -79,8 +79,7 @@ private void handleBinary(byte[] buffer) {
7979
pushFrameBuilder.setPayloadType("ack");
8080
pushFrameBuilder.setLogId(websocketPushFrame.getLogId());
8181
pushFrameBuilder.setPayload(webcastResponse.getInternalExtBytes());
82-
if (isNotClosing())
83-
{
82+
if (isOpen()) {
8483
this.send(pushFrameBuilder.build().toByteArray());
8584
}
8685
}
@@ -90,7 +89,7 @@ private void handleBinary(byte[] buffer) {
9089
@Override
9190
public void onOpen(ServerHandshake serverHandshake) {
9291
tikTokEventHandler.publish(tikTokLiveClient, new TikTokConnectedEvent());
93-
if (isNotClosing()) {
92+
if (isOpen()) {
9493
sendPing();
9594
}
9695
}
@@ -104,7 +103,7 @@ public void onClose(int code, String reason, boolean remote) {
104103
@Override
105104
public void onError(Exception error) {
106105
tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(error));
107-
if (isNotClosing()) {
106+
if (isOpen()) {
108107
sendPing();
109108
}
110109
}
@@ -129,10 +128,6 @@ private WebcastResponse getWebResponseMessage(ByteString buffer) {
129128
}
130129
}
131130

132-
private boolean isNotClosing() {
133-
return !isClosed() && !isClosing();
134-
}
135-
136131
@Override
137132
public void onMessage(String s) {
138133
// System.err.println(s);

0 commit comments

Comments
 (0)