From a0e08c21d124c108e2a741c80fca4b59c63ebe4c Mon Sep 17 00:00:00 2001 From: Jiwe Guo Date: Tue, 4 Jul 2023 14:00:52 +0800 Subject: [PATCH 1/2] Fix Filter NPE --- .../java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java | 2 +- .../org/apache/pulsar/broker/web/ResponseHandlerFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java index 5e1b33ecc0cb9..fa2d4815cac50 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ProcessHandlerFilter.java @@ -37,7 +37,7 @@ public class ProcessHandlerFilter implements Filter { public ProcessHandlerFilter(PulsarService pulsar) { this.interceptor = pulsar.getBrokerInterceptor(); - this.interceptorEnabled = !pulsar.getConfig().getBrokerInterceptors().isEmpty(); + this.interceptorEnabled = interceptor != null && !pulsar.getConfig().isDisableBrokerInterceptors(); } @Override diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java index 4c5f3e2eab4fb..148338eba4637 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java @@ -51,7 +51,7 @@ public class ResponseHandlerFilter implements Filter { public ResponseHandlerFilter(PulsarService pulsar) { this.brokerAddress = pulsar.getAdvertisedAddress(); this.interceptor = pulsar.getBrokerInterceptor(); - this.interceptorEnabled = !pulsar.getConfig().getBrokerInterceptors().isEmpty(); + this.interceptorEnabled = interceptor != null && !pulsar.getConfig().isDisableBrokerInterceptors(); } @Override From 81dc3f909c9027b106a8b40ea8d4ce000c8b2421 Mon Sep 17 00:00:00 2001 From: Jiwe Guo Date: Tue, 4 Jul 2023 17:44:35 +0800 Subject: [PATCH 2/2] fix test --- .../apache/pulsar/broker/intercept/InterceptFilterOutTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java index 3d8c4732d2aa7..15a37f60ff98e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/intercept/InterceptFilterOutTest.java @@ -151,7 +151,7 @@ public void testShouldNotInterceptWhenInterceptorDisabled() throws Exception { Mockito.doReturn(interceptor).when(pulsarService).getBrokerInterceptor(); ServiceConfiguration conf = Mockito.mock(ServiceConfiguration.class); // Disable the broker interceptor - Mockito.doReturn(Sets.newHashSet()).when(conf).getBrokerInterceptors(); + Mockito.doReturn(true).when(conf).isDisableBrokerInterceptors(); Mockito.doReturn(conf).when(pulsarService).getConfig(); ResponseHandlerFilter filter = new ResponseHandlerFilter(pulsarService);