HornetQ thread dead lock

After changes for AS7-3379

Found one Java-level deadlock:
"Thread-1 (HornetQ-client-global-threads-487721956)":
waiting to lock monitor 7fcb400cec58 (object 7d5eb7090, a java.lang.Object),
which is held by "MSC service thread 1-9"
"MSC service thread 1-9":
waiting to lock monitor 7fcb43911dd8 (object 7d5eb70d8, a java.lang.Object),
which is held by "Thread-1 (HornetQ-client-global-threads-487721956)"

Java stack information for the threads listed above:
"Thread-1 (HornetQ-client-global-threads-487721956)":
at org.hornetq.core.client.impl.ClientSessionFactoryImpl.close(ClientSessionFactoryImpl.java:458)

• waiting to lock (a java.lang.Object)
  at org.hornetq.jms.server.recovery.HornetQXAResourceWrapper.close(HornetQXAResourceWrapper.java:391)
  at org.hornetq.jms.server.recovery.HornetQXAResourceWrapper.connectionFailed(HornetQXAResourceWrapper.java:232)
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl.callFailureListeners(ClientSessionFactoryImpl.java:905)
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:690)
• locked (a java.lang.Object)
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:556)
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl.access$000(ClientSessionFactoryImpl.java:79)
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl$DelegatingFailureListener.connectionFailed(ClientSessionFactoryImpl.java:1560)
  at org.hornetq.core.protocol.core.impl.RemotingConnectionImpl.callFailureListeners(RemotingConnectionImpl.java:582)
  at org.hornetq.core.protocol.core.impl.RemotingConnectionImpl.fail(RemotingConnectionImpl.java:335)
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl$Channel0Handler$1.run(ClientSessionFactoryImpl.java:1467)
  at org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)
  at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
  at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
  at java.lang.Thread.run(Thread.java:680)
  "MSC service thread 1-9":
  at org.hornetq.core.client.impl.ClientSessionFactoryImpl.close(ClientSessionFactoryImpl.java:461)
• waiting to lock (a java.lang.Object)
• locked (a java.lang.Object)
  at org.hornetq.core.client.impl.ServerLocatorImpl.doClose(ServerLocatorImpl.java:1294)
  at org.hornetq.core.client.impl.ServerLocatorImpl.close(ServerLocatorImpl.java:1238)
  at org.hornetq.jms.client.HornetQConnectionFactory.close(HornetQConnectionFactory.java:554)
  at org.hornetq.ra.HornetQResourceAdapter.stop(HornetQResourceAdapter.java:265)
  at org.jboss.as.connector.metadata.deployment.AbstractResourceAdapterDeploymentService.stop(AbstractResourceAdapterDeploymentService.java:172)
  at org.jboss.as.connector.services.ResourceAdapterActivatorService.stop(ResourceAdapterActivatorService.java:122)
  at org.jboss.msc.service.ServiceControllerImpl$StopTask.stopService(ServiceControllerImpl.java:1909)
  at org.jboss.msc.service.ServiceControllerImpl$StopTask.run(ServiceControllerImpl.java:1872)
  at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
  at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
  at java.lang.Thread.run(Thread.java:680)

see there
https://github.com/jbossas/jboss-as/pull/1261