Repository: activemq-artemis Updated Branches: refs/heads/master d7d494e8f -> 8cbcc809a
ARTEMIS-385 clean-up factory on timeout This restores a call to ClientSessionFactory#cleanup that appears to have been mistakenly removed by a previous change related to this JIRA. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b23046d5 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b23046d5 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b23046d5 Branch: refs/heads/master Commit: b23046d5f7c958e8f38e86de12979d75c97c401a Parents: d7d494e Author: jbertram <[email protected]> Authored: Thu Mar 3 12:41:12 2016 -0600 Committer: jbertram <[email protected]> Committed: Thu Mar 3 12:42:20 2016 -0600 ---------------------------------------------------------------------- .../activemq/artemis/core/client/impl/ServerLocatorImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b23046d5/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java index 22a2e0e..53ba9df 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java @@ -809,6 +809,9 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery // how the sendSubscription happens. // in case this ever changes. if (topology != null && !factory.waitForTopology(callTimeout, TimeUnit.MILLISECONDS)) { + if (factory != null) { + factory.cleanup(); + } throw ActiveMQClientMessageBundle.BUNDLE.connectionTimedOutOnReceiveTopology(discoveryGroup); }
