unwrap exception

apache · Jan 29, 2022 · d65be28 · d65be28
1 parent 6b60661
commit d65be28
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
@@ -247,9 +247,17 @@ protected void validateAdminAccessForTenant(String tenant) {
 
     protected static void validateAdminAccessForTenant(PulsarService pulsar, String clientAppId,
                                                        String originalPrincipal, String tenant,
-                                                       AuthenticationDataSource authenticationData)
-            throws Exception {
-        validateAdminAccessForTenantAsync(pulsar, clientAppId, originalPrincipal, tenant, authenticationData).get();
+                                                       AuthenticationDataSource authenticationData) {
+        try {
+            validateAdminAccessForTenantAsync(pulsar, clientAppId, originalPrincipal, tenant, authenticationData).get();
+        } catch (InterruptedException | ExecutionException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof WebApplicationException){
+                throw (WebApplicationException) cause;
+            } else {
+                throw new RestException(cause);
+            }
+        }
     }
 
     /**