Browse Source

Fix incorrect cast in NettyRoutingFilter

pull/3008/head
Gonçalo Marques 1 year ago
parent
commit
ba030a65df
No known key found for this signature in database
GPG Key ID: CB873CB73CDC522C
  1. 2
      spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java
  2. 1
      spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterCompatibleTests.java

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

@ -280,7 +280,7 @@ public class NettyRoutingFilter implements GlobalFilter, Ordered { @@ -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

@ -56,6 +56,7 @@ class NettyRoutingFilterCompatibleTests extends BaseWebClientTests { @@ -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);
}

Loading…
Cancel
Save