Skip to content
2 changes: 1 addition & 1 deletion changes/en-us/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Add changes here for all PR submitted to the 2.x branch.
<!-- Please add the `changes` to the following location(feature/bugfix/optimize/test) based on the type of PR -->

### feature:

- [[#7599](https://github.com/apache/incubator-seata/pull/7485)] Optimize the exception message
- [[#7485](https://github.com/apache/incubator-seata/pull/7485)] Add http request filter for seata-server
- [[#7509](https://github.com/apache/incubator-seata/pull/7509)] Reuse connection to merge branch transactions
- [[#7492](https://github.com/apache/incubator-seata/pull/7492)] upgrade HTTP client in common module to support HTTP/2
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

### feature:

- [[#7599](https://github.com/apache/incubator-seata/pull/7485)] 优化异常消息
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move to optimize part.

- [[#7485](https://github.com/apache/incubator-seata/pull/7485)] 给seata-server端的http请求添加过滤器
- [[#7509](https://github.com/apache/incubator-seata/pull/7509)] 复用连接合并分支事务
- [[#7492](https://github.com/apache/incubator-seata/pull/7492)] 升级 common 模块中的 HTTP 客户端以支持 HTTP/2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,11 @@ public Channel getNewChannel(InetSocketAddress address) {
try {
f.await(this.nettyClientConfig.getConnectTimeoutMillis(), TimeUnit.MILLISECONDS);
if (f.isCancelled()) {
throw new FrameworkException(f.cause(), "connect cancelled, can not connect to services-server.");
throw new FrameworkException(
f.cause(), "connect cancelled, can not connect to services-server:" + address.toString() + ".");
} else if (!f.isSuccess()) {
throw new FrameworkException(f.cause(), "connect failed, can not connect to services-server.");
throw new FrameworkException(
f.cause(), "connect failed, can not connect to services-server:" + address.toString() + ".");
} else {
channel = f.channel();
}
Expand All @@ -208,8 +210,10 @@ public void handlerAdded(ChannelHandlerContext ctx) {
channel = bootstrap.open().get();
}

} catch (FrameworkException frameworkException) {
throw frameworkException;
} catch (Exception e) {
throw new FrameworkException(e, "can not connect to services-server.");
throw new FrameworkException(e, "can not connect to services-server:" + address.toString() + ".");
}

return channel;
Expand Down
Loading