diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java
index f80427fb84bf3..34b42ecc4eabf 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/NamespaceResources.java
@@ -153,13 +153,16 @@ public CompletableFuture<Void> setPoliciesAsync(NamespaceName ns, Function<Polic
     }
 
     public static boolean pathIsFromNamespace(String path) {
-        return path.startsWith(BASE_POLICIES_PATH + "/")
-                && path.substring(BASE_POLICIES_PATH.length() + 1).contains("/");
+        return pathHasNestedSegmentUnderRoot(path, BASE_POLICIES_PATH);
     }
 
     public static boolean pathIsNamespaceLocalPolicies(String path) {
-        return path.startsWith(LOCAL_POLICIES_ROOT + "/")
-                && path.substring(LOCAL_POLICIES_ROOT.length() + 1).contains("/");
+        return pathHasNestedSegmentUnderRoot(path, LOCAL_POLICIES_ROOT);
+    }
+
+    private static boolean pathHasNestedSegmentUnderRoot(String path, String rootPath) {
+        return path.startsWith(rootPath + "/")
+                && path.substring(rootPath.length() + 1).contains("/");
     }
 
     /**
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java
index 66d2e81fb0eb9..8f63672887e4e 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TopicResources.java
@@ -90,14 +90,18 @@ public CompletableFuture<Boolean> persistentTopicExists(TopicName topic) {
     }
 
     public CompletableFuture<Void> clearNamespacePersistence(NamespaceName ns) {
-        String path = MANAGED_LEDGER_PATH + "/" + ns;
-        log.info().attr("namespace", ns).attr("path", path).log("Clearing namespace persistence for namespace: , path");
-        return store.deleteIfExists(path, Optional.empty());
+        return clearManagedLedgerPathIfExistsAsync(ns, MANAGED_LEDGER_PATH + "/" + ns,
+                "Clearing namespace persistence for namespace: , path");
     }
 
     public CompletableFuture<Void> clearDomainPersistence(NamespaceName ns) {
-        String path = MANAGED_LEDGER_PATH + "/" + ns + "/persistent";
-        log.info().attr("namespace", ns).attr("path", path).log("Clearing domain persistence for namespace: , path");
+        return clearManagedLedgerPathIfExistsAsync(ns, MANAGED_LEDGER_PATH + "/" + ns + "/persistent",
+                "Clearing domain persistence for namespace: , path");
+    }
+
+    private CompletableFuture<Void> clearManagedLedgerPathIfExistsAsync(
+            NamespaceName ns, String path, String logMessage) {
+        log.info().attr("namespace", ns).attr("path", path).log(logMessage);
         return store.deleteIfExists(path, Optional.empty());
     }