qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tr...@apache.org
Subject [47/50] [abbrv] qpid-dispatch git commit: Fixed a merge-conflict resolution error.
Date Fri, 18 Mar 2016 23:07:05 GMT
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 <tross@redhat.com>
Authored: Fri Mar 18 16:00:50 2016 -0400
Committer: Ted Ross <tross@redhat.com>
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


Mime
View raw message