From 8c807d19c37c6e719cb96394e11215e4894fc35c Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 30 Jan 2013 20:08:36 -0800 Subject: [PATCH 1/2] Fixing exit-after-terminate when used with bare mode. --- src/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cc b/src/main.cc index 5999186240..fffedee3dd 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1053,7 +1053,7 @@ int main(int argc, char** argv) io_sources.Register(thread_mgr, true); - if ( io_sources.Size() > 0 || have_pending_timers ) + if ( io_sources.Size() > 0 || have_pending_timers || BifConst::exit_only_after_terminate ) { if ( profiling_logger ) profiling_logger->Log(); From b08bdbce46bdccbb8df5d4904ca87be4d1f36c9e Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 30 Jan 2013 20:09:19 -0800 Subject: [PATCH 2/2] Updating submodule(s). [nomail] --- aux/btest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aux/btest b/aux/btest index 3585dc9a7a..ba0700fe44 160000 --- a/aux/btest +++ b/aux/btest @@ -1 +1 @@ -Subproject commit 3585dc9a7afe20d70cb77fc2472cc6bce3850b67 +Subproject commit ba0700fe448895b654b90d50f389f6f1341234cb