Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.0] catch handler.caught() throwable of MultiMessageHandler #8930

Merged
merged 3 commits into from
Sep 27, 2021
Merged

[3.0] catch handler.caught() throwable of MultiMessageHandler #8930

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13c6b60
catch handler.caught() throwable of MultiMessageHandler
zrlw Sep 27, 2021
bea8a13
remove useless import, fix ut
zrlw Sep 27, 2021
63b6c02
Merge branch '3.0' into patch-MultiMessageHandler
zrlw Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...o-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/MultiMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.remoting.Channel;
import org.apache.dubbo.remoting.ChannelHandler;
import org.apache.dubbo.remoting.ExecutionException;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.exchange.support.MultiMessage;

Expand All @@ -43,9 +42,13 @@ public void received(Channel channel, Object message) throws RemotingException {
for (Object obj : list) {
try {
handler.received(channel, obj);
} catch (ExecutionException e) {
logger.error("MultiMessageHandler received fail.", e);
handler.caught(channel, e);
} catch (Throwable t) {
logger.error("MultiMessageHandler received fail.", t);
try {
handler.caught(channel, t);
} catch (Throwable t1) {
logger.error("MultiMessageHandler caught fail.", t1);
}
}
}
} else {
Expand Down
3 changes: 3 additions & 0 deletions ...src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,15 @@ public void after() throws Exception {
server = null;
}

FakeChannelHandlers.resetChannelHandlers();

// wait for timer to finish
Thread.sleep(2000);
}

@Test
public void testServerHeartbeat() throws Exception {
FakeChannelHandlers.resetChannelHandlers();
URL serverURL = URL.valueOf("telnet://localhost:" + NetUtils.getAvailablePort(56780))
.addParameter(Constants.EXCHANGER_KEY, HeaderExchanger.NAME)
.addParameter(Constants.TRANSPORTER_KEY, "netty3")
Expand Down