[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  064e62fc02c5552d1b0d815aec1bc7e07f76693b (commit)
      from  84db63139cb52ad0f33bc9d275b754c3b3e7ec73 (commit)

Summary of changes:
 src/BasicRoutingServiceApp.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 064e62fc02c5552d1b0d815aec1bc7e07f76693b
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Sep 13 11:54:21 2010 -0300

    Fix a bug where the routing service may or may not have unregistered from the service locator during shutdown.

diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index d88ed4a..825d5b4 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -176,6 +176,8 @@ void BasicRoutingServiceApp::interruptCallback(int val)
 {
     cout << "Exiting..." << endl;
 	 mDone = true;
+	 // Remove our interfaces from the service locator.
+	 deregisterFromServiceLocator();
 	 _exit(EXIT_SUCCESS);
 }
 
@@ -325,9 +327,6 @@ int BasicRoutingServiceApp::run(int argc, char* argv[])
    // Run until it's time to run no more. 
    communicator()->waitForShutdown();
 
-   // Remove our interfaces from the service locator.
-   deregisterFromServiceLocator();
-
    // Give our singleton a chance to shut down gracefully. 
    mDataModelInstance.cleanup();
 

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/routing.git