Skip to content

Commit 9ce5dd6

Browse files
authored
[ISSUE #4855] Fix close tcp client failed (#4856)
1 parent 2e4fc1b commit 9ce5dd6

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Diff for: eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/common/TcpClient.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
@Slf4j
6161
public abstract class TcpClient implements Closeable {
6262

63-
protected static transient int CLIENTNO = 0;
63+
protected static int CLIENTNO = 0;
6464

6565
static {
6666
try {
@@ -123,12 +123,15 @@ public void initChannel(SocketChannel ch) {
123123
@Override
124124
public void close() {
125125
try {
126+
127+
goodbye();
128+
126129
channel.disconnect().sync();
127-
workers.shutdownGracefully();
130+
workers.shutdownGracefully().sync();
128131
if (heartTask != null) {
129132
heartTask.cancel(false);
130133
}
131-
goodbye();
134+
132135
} catch (Exception e) {
133136
Thread.currentThread().interrupt();
134137
log.warn("close tcp client failed.|remote address={}", channel.remoteAddress(), e);

Diff for: eventmesh-sdks/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/tcp/impl/cloudevent/CloudEventTCPSubClient.java

-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ public void registerBusiHandler(ReceiveMsgHook<CloudEvent> handler) throws Event
135135
@Override
136136
public void close() {
137137
try {
138-
goodbye();
139138
super.close();
140139
} catch (Exception ex) {
141140
log.error("exception occurred when close", ex);

0 commit comments

Comments
 (0)