Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C4BEC182BF for ; Fri, 18 Mar 2016 23:06:21 +0000 (UTC) Received: (qmail 80602 invoked by uid 500); 18 Mar 2016 23:06:21 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 80563 invoked by uid 500); 18 Mar 2016 23:06:21 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 80002 invoked by uid 99); 18 Mar 2016 23:06:20 -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; Fri, 18 Mar 2016 23:06:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1749DFCE4; Fri, 18 Mar 2016 23:06:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tross@apache.org To: commits@qpid.apache.org Date: Fri, 18 Mar 2016 23:07:05 -0000 Message-Id: In-Reply-To: <4137f4ca84054b0d9c4a5f9c35c39799@git.apache.org> References: <4137f4ca84054b0d9c4a5f9c35c39799@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] qpid-dispatch git commit: Fixed a merge-conflict resolution error. Fixed a merge-conflict resolution error. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/8c19dd10 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/8c19dd10 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/8c19dd10 Branch: refs/heads/master Commit: 8c19dd10c673d8cbb3da0b5bd075338a175a08c2 Parents: d953608 Author: Ted Ross Authored: Fri Mar 18 16:00:50 2016 -0400 Committer: Ted Ross Committed: Fri Mar 18 16:00:50 2016 -0400 ---------------------------------------------------------------------- src/connection_manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/8c19dd10/src/connection_manager.c ---------------------------------------------------------------------- diff --git a/src/connection_manager.c b/src/connection_manager.c index 34c833d..c5b12e4 100644 --- a/src/connection_manager.c +++ b/src/connection_manager.c @@ -233,13 +233,14 @@ qd_config_connector_t *qd_dispatch_configure_connector(qd_dispatch_t *qd, qd_ent qd_log(cm->log_source, QD_LOG_ERROR, "Unable to create config connector: %s", qd_error_message()); qd_config_connector_free(cc); return 0; + } + DEQ_ITEM_INIT(cc); DEQ_INSERT_TAIL(cm->config_connectors, cc); qd_log(cm->log_source, QD_LOG_INFO, "Configured Connector: %s:%s proto=%s role=%s", cc->configuration.host, cc->configuration.port, cc->configuration.protocol_family ? cc->configuration.protocol_family : "any", cc->configuration.role); - } return cc; } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org