-fix config, shutdown issue

2 files changed, 4 insertions, 1 deletions

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 743c19436..a1d47e3b9 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -726,6 +726,9 @@ GAS_addresses_destroy_all ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Destroying all addresses\n");
+  if (0 ==
+      GNUNET_CONTAINER_multipeermap_size (GSA_addresses))
+    return;
   GAS_plugin_solver_lock ();
   GNUNET_CONTAINER_multipeermap_iterate (GSA_addresses,
                                          &destroy_all_address_it,
diff --git a/src/ats/test_ats_solver_mlp.conf b/src/ats/test_ats_solver_mlp.conf
index 407b616f8..2e3a35740 100644
--- a/src/ats/test_ats_solver_mlp.conf
+++ b/src/ats/test_ats_solver_mlp.conf
@@ -1,7 +1,7 @@
 @INLINE@ test_ats_solver_default.conf
 
 [ats]
-MODE = MLP
+MODE = mlp
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 64 KiB
 UNSPECIFIED_QUOTA_OUT = 64 KiB