SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 4.0.x

Browse Source
This commit is contained in:
Ryan Baxter
2023-07-20 15:17:59 -04:00
parent fba558aade 6935fe74d7
commit da5406db3b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java
View File

@@ -280,7 +280,7 @@ public class NettyRoutingFilter implements GlobalFilter, Ordered {
static Long getLong(Object responseTimeoutAttr) {
Long responseTimeout = null;
if (responseTimeoutAttr instanceof Number) {
responseTimeout = ((Integer) responseTimeoutAttr).longValue();
responseTimeout = ((Number) responseTimeoutAttr).longValue();
}
else if (responseTimeoutAttr != null) {
responseTimeout = Long.parseLong(responseTimeoutAttr.toString());

1
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterCompatibleTests.java
View File

@@ -56,6 +56,7 @@ class NettyRoutingFilterCompatibleTests extends BaseWebClientTests {
void getLongHandlesStringAndNumber() {
assertThat(NettyRoutingFilter.getLong("5")).isEqualTo(5);
assertThat(NettyRoutingFilter.getLong(5)).isEqualTo(5);
assertThat(NettyRoutingFilter.getLong(50000L)).isEqualTo(50000);
assertThat(NettyRoutingFilter.getLong(null)).isNull();
assertThatThrownBy(() -> NettyRoutingFilter.getLong("notanumber")).isInstanceOf(NumberFormatException.class);
}