Convert client exception in management initialization

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/impl/AmqpManagement.java

@@ -276,7 +276,7 @@ void init() {
               this.state(OPEN);
             } catch (Exception e) {
               LOGGER.info("Error during management {} initialization: {}", cName, e.getMessage());
-              throw new AmqpException(e);
+              throw ExceptionUtils.convert(e);
             } finally {
               this.initializing = false;
             }

src/main/java/com/rabbitmq/client/amqp/impl/ExceptionUtils.java

@@ -48,6 +48,14 @@ static <T> T wrapGet(Future<T> future) throws ClientException {
     }
   }
 
+  static AmqpException convert(Exception e) {
+    if (e instanceof ClientException) {
+      return convert((ClientException) e);
+    } else {
+      return new AmqpException(e);
+    }
+  }
+
   static AmqpException convert(ClientException e) {
     return convert(e, null);
   }

src/test/java/com/rabbitmq/client/amqp/impl/ExceptionUtilsTest.java

@@ -52,6 +52,8 @@ void convertTest() {
         .isInstanceOf(AmqpException.AmqpConnectionException.class);
     assertThat(convert(new ClientConnectionRemotelyClosedException("connection refused")))
         .isInstanceOf(AmqpException.AmqpConnectionException.class);
+    assertThat(convert(new ClientConnectionRemotelyClosedException("connection forced")))
+        .isInstanceOf(AmqpException.AmqpConnectionException.class);
     assertThat(convert(new ClientConnectionRemotelyClosedException("", new RuntimeException())))
         .isInstanceOf(AmqpException.AmqpConnectionException.class)
         .hasCauseInstanceOf(ClientConnectionRemotelyClosedException.class);