Deep copy the tenants to avoid concurrent sort exception (apache#11463)

lionelcao · Jul 29, 2021 · 191dc62 · 191dc62
1 parent 026eac8
commit 191dc62
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
@@ -24,6 +24,7 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -76,8 +77,10 @@ public void getTenants(@Suspended final AsyncResponse asyncResponse) {
                 asyncResponse.resume(new RestException(e));
                 return;
             }
-            tenants.sort(null);
-            asyncResponse.resume(tenants);
+            // deep copy the tenants to avoid concurrent sort exception
+            List<String> deepCopy = new ArrayList<>(tenants);
+            deepCopy.sort(null);
+            asyncResponse.resume(deepCopy);
         });
     }