fix test error

apache · Aug 24, 2022 · c101b63 · c101b63
1 parent 7c0519f
commit c101b63
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -310,7 +310,8 @@ protected CompletableFuture<Void> internalDeleteNamespaceAsync() {
                                                 .getNamespaceBundleFactory()
                                                 .getBundles(namespaceName);
                                         for (NamespaceBundle bundle : bundles.getBundles()) {
-                                            // check if the bundle is owned by any broker, if not then we do not need to delete the bundle
+                                            // check if the bundle is owned by any broker,
+                                            // if not then we do not need to delete the bundle
                                             deleteBundleFutures.add(pulsar().getNamespaceService()
                                                     .getOwnerAsync(bundle).thenCompose(ownership -> {
                                                 if (ownership.isPresent()) {
@@ -429,11 +430,14 @@ protected CompletableFuture<Void> internalDeleteNamespaceForcefullyAsync() {
                         }
                     }
                     return future
-                            .thenCompose(__ -> namespaceResources().setPoliciesAsync(namespaceName, old -> {
-                                old.deleted = true;
-                                return old;
-                            }))
                             .thenCompose(__ -> pulsar().getNamespaceService().getFullListOfTopics(namespaceName)
+                            .thenCompose(topics -> {
+                                namespaceResources().setPoliciesAsync(namespaceName, old -> {
+                                    old.deleted = true;
+                                    return old;
+                                });
+                                return CompletableFuture.completedFuture(topics);
+                            })
                             .thenCompose(topics -> {
                          final List<CompletableFuture<Void>> topicFutures = Lists.newArrayList();
                          if (!topics.isEmpty()) {
@@ -476,7 +480,8 @@ protected CompletableFuture<Void> internalDeleteNamespaceForcefullyAsync() {
                              NamespaceBundles bundles = pulsar().getNamespaceService()
                                      .getNamespaceBundleFactory().getBundles(namespaceName);
                              for (NamespaceBundle bundle : bundles.getBundles()) {
-                                 // check if the bundle is owned by any broker, if not then we do not need to delete the bundle
+                                 // check if the bundle is owned by any broker,
+                                 // if not then we do not need to delete the bundle
                                  deleteBundleFutures.add(pulsar().getNamespaceService().getOwnerAsync(bundle)
                                          .thenCompose(ownership -> {
                                      if (ownership.isPresent()) {