[#1730] Fixed lib order and cosmetic comment

src/bin/dhcp6/tests/Makefile.am
src/hooks/dhcp/flex_option/Makefile.am
src/hooks/dhcp/flex_option/libloadtests/Makefile.am
src/hooks/dhcp/flex_option/tests/Makefile.am
    Fixed lib order.

src/lib/http/tests/connection_pool_unittests.cc
    cosmetic fix

diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 23dbf81c96abdd4b7082b61861bd4f7c2260a73d..6ee78cdc31910c7a9ad6c0bdfb06a130a0548237 100644 (file)
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -134,9 +134,8 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtes
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
-dhcp6_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+dhcp6_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 dhcp6_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la

diff --git a/src/hooks/dhcp/flex_option/Makefile.am b/src/hooks/dhcp/flex_option/Makefile.am
index 2ec77361b8818c2af3186ba8dc93a11bb1ab488b..526baaed976daf90d7b14ed71bd1e60da0bebc4b 100644 (file)
--- a/src/hooks/dhcp/flex_option/Makefile.am
+++ b/src/hooks/dhcp/flex_option/Makefile.am
@@ -35,9 +35,9 @@ libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/process/libkea-process.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/http/libkea-http.la
-libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 libdhcp_flex_option_la_LIBADD += $(top_builddir)/src/lib/database/libkea-database.la

diff --git a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
index 4ca41bbfd63ce15b76ec27103c29c6571102a459..9730bee9affcd81b8adad95d84a63cdf8eb13bee 100644 (file)
--- a/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/libloadtests/Makefile.am
@@ -39,9 +39,9 @@ flex_option_unittests_LDADD  = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la

diff --git a/src/hooks/dhcp/flex_option/tests/Makefile.am b/src/hooks/dhcp/flex_option/tests/Makefile.am
index 7f92bf3faf7a6a222e6550309e6dee4a2cf7c12f..0cabc14855a546b7e0e09ef29b1af07cb0820cf6 100644 (file)
--- a/src/hooks/dhcp/flex_option/tests/Makefile.am
+++ b/src/hooks/dhcp/flex_option/tests/Makefile.am
@@ -39,9 +39,9 @@ flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/eval/libkea-eval.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
+flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/http/libkea-http.la
-flex_option_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 flex_option_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la

diff --git a/src/lib/http/tests/connection_pool_unittests.cc b/src/lib/http/tests/connection_pool_unittests.cc
index fdbd18f4e5c0e48565538317615b4d82701f36e1..0635f2a9bd92870e047eb3b99b49677942091068 100644 (file)
--- a/src/lib/http/tests/connection_pool_unittests.cc
+++ b/src/lib/http/tests/connection_pool_unittests.cc
@@ -194,6 +194,7 @@ public:
                                                    HttpAcceptorCallback(),
                                                    CONN_REQUEST_TIMEOUT,
                                                    CONN_IDLE_TIMEOUT));
+
         HttpConnectionPtr conn2(new HttpConnection(io_service_, acceptor_,
                                                    connection_pool_,
                                                    response_creator_,