Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 48991200D06 for ; Mon, 25 Sep 2017 16:33:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 46CFA1609E9; Mon, 25 Sep 2017 14:33:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B39EA1609BB for ; Mon, 25 Sep 2017 16:33:48 +0200 (CEST) Received: (qmail 20210 invoked by uid 500); 25 Sep 2017 14:33:47 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 20201 invoked by uid 99); 25 Sep 2017 14:33:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Sep 2017 14:33:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EF74F564E; Mon, 25 Sep 2017 14:33:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Mon, 25 Sep 2017 14:33:45 -0000 Message-Id: <320ed50921dc481fbbe6bbea9929a38d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: This closes #1546 archived-at: Mon, 25 Sep 2017 14:33:49 -0000 Repository: activemq-artemis Updated Branches: refs/heads/master bb8c11b1e -> d170639bf This closes #1546 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d170639b Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d170639b Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d170639b Branch: refs/heads/master Commit: d170639bfedf95ec46c01f27fb622c940e4eef7c Parents: bb8c11b 0010b0a Author: Clebert Suconic Authored: Mon Sep 25 10:33:56 2017 -0400 Committer: Clebert Suconic Committed: Mon Sep 25 10:33:56 2017 -0400 ---------------------------------------------------------------------- .../core/client/impl/ServerLocatorImpl.java | 4 +++- .../ActiveMQClientProtocolManagerFactory.java | 6 +++++ .../remoting/ClientProtocolManagerFactory.java | 10 +++++++++ .../HornetQClientProtocolManagerFactory.java | 23 ++++++++++++++++++++ ...ctiveMQServerSideProtocolManagerFactory.java | 6 +++++ .../xa/recovery/XARecoveryConfig.java | 6 ++++- 6 files changed, 53 insertions(+), 2 deletions(-) ----------------------------------------------------------------------