Skip to content

Commit fd7daa0

Browse files
authored
Merge branch 'release-2.7.0' into release-2.7.0
2 parents 8f10511 + 63ed57f commit fd7daa0

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ public void onConnect(ChannelHandlerContext ctx) {
9090

9191
@Override
9292
public void onMessage(ChannelHandlerContext ctx, Message msg) {
93-
logger.trace(
94-
"receive msg, msg type:{}, content:{}", msg.getType(), new String(msg.getData()));
93+
logger.trace("receive msg, msg type:{}, seq:{}", msg.getType(), msg.getSeq());
9594
if (!isRunning) {
9695
logger.warn("Amop on msg, amop is not running, exit.");
9796
}

sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ public void asyncSendToRandom(Message out, ResponseCallback callback, Options op
330330
if (peerList.size() == 0) {
331331
logger.warn(
332332
"no available peer to send to, seq: {}, type: {}", out.getSeq(), out.getType());
333+
return;
333334
}
334335
int random = (int) (Math.random() * (peerList.size()));
335336
String peerIpPort = peerList.get(random);

sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void onConnect(ChannelHandlerContext ctx) {
120120

121121
@Override
122122
public void onMessage(ChannelHandlerContext ctx, Message msg) {
123-
logger.trace(
123+
logger.debug(
124124
"onMessage in ChannelMsgHandler called, host : {}, seq : {}, msgType : {}",
125125
ChannelVersionNegotiation.getPeerHost(ctx),
126126
msg.getSeq(),
@@ -144,15 +144,16 @@ public void onMessage(ChannelHandlerContext ctx, Message msg) {
144144
response.setCtx(ctx);
145145
callback.onResponse(response);
146146
} else {
147-
logger.trace(
148-
" receive message, no callback, try call handler, seq:{} , type: {}, result: {}",
149-
msg.getSeq(),
150-
(int) msg.getType(),
151-
msg.getResult());
152147
MsgHandler msgHandler = msgHandlers.get(msg.getType().intValue());
153148
if (msgHandler != null) {
149+
logger.trace(
150+
" receive message, no callback, call handler, seq:{} , type: {}, result: {}",
151+
msg.getSeq(),
152+
(int) msg.getType(),
153+
msg.getResult());
154154
msgHandler.onMessage(ctx, msg);
155155
}
156+
logger.debug(" call ");
156157
}
157158
}
158159

0 commit comments

Comments
 (0)