You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/20 16:30:23 UTC
[pulsar] 12/19: Remove catching `NamingException`. (#12725)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit d7ae988bea0651095632a5ca1ad0f50c5c2331a7
Author: Jiwei Guo <te...@apache.org>
AuthorDate: Thu Nov 11 23:37:42 2021 +0800
Remove catching `NamingException`. (#12725)
(cherry picked from commit 6ab7401056f6c0f6bdf695fecc2764fdff16fcac)
---
.../src/main/java/org/apache/pulsar/broker/service/BrokerService.java | 2 +-
.../org/apache/pulsar/broker/service/persistent/PersistentTopic.java | 2 +-
.../java/org/apache/pulsar/broker/service/persistent/SystemTopic.java | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 76c295b..b3fca06 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -1362,7 +1362,7 @@ public class BrokerService implements Closeable {
return null;
});
- } catch (NamingException | PulsarServerException e) {
+ } catch (PulsarServerException e) {
log.warn("Failed to create topic {}-{}", topic, e.getMessage());
pulsar.getExecutor().execute(() -> topics.remove(topic, topicFuture));
topicFuture.completeExceptionally(e);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index c898bbb..c232071 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -250,7 +250,7 @@ public class PersistentTopic extends AbstractTopic
}
}
- public PersistentTopic(String topic, ManagedLedger ledger, BrokerService brokerService) throws NamingException {
+ public PersistentTopic(String topic, ManagedLedger ledger, BrokerService brokerService) {
super(topic, brokerService);
this.ledger = ledger;
this.subscriptions = new ConcurrentOpenHashMap<>(16, 1);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
index aaf83a9..6e3173f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/SystemTopic.java
@@ -23,12 +23,10 @@ import java.util.concurrent.CompletableFuture;
import org.apache.bookkeeper.mledger.ManagedLedger;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.service.BrokerService;
-import org.apache.pulsar.broker.service.BrokerServiceException;
public class SystemTopic extends PersistentTopic {
- public SystemTopic(String topic, ManagedLedger ledger, BrokerService brokerService)
- throws BrokerServiceException.NamingException, PulsarServerException {
+ public SystemTopic(String topic, ManagedLedger ledger, BrokerService brokerService) throws PulsarServerException {
super(topic, ledger, brokerService);
}