[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  c977ec5bbe15874cd222c0b181c8c75419975224 (commit)
       via  4f75a2866c33895ced0757ea9f12e31fc40ba093 (commit)
      from  1de67641a3e4c2c0bfcfa244a455543af8797ac0 (commit)

Summary of changes:
 src/PJSipSessionModuleConstruction.cpp |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit c977ec5bbe15874cd222c0b181c8c75419975224
Merge: 4f75a28 1de6764
Author: Mark Michelson <mmichelson at digium.com>
Date:   Sat Jun 25 17:33:12 2011 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/sip
    
    Conflicts:
    	src/PJSipSessionModuleConstruction.cpp


commit 4f75a2866c33895ced0757ea9f12e31fc40ba093
Author: Mark Michelson <mmichelson at digium.com>
Date:   Sat Jun 25 17:31:56 2011 -0500

    Fix merge problem.

diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index c7af8d2..a9e1220 100644
--- a/src/PJSipSessionModuleConstruction.cpp
+++ b/src/PJSipSessionModuleConstruction.cpp
@@ -19,6 +19,13 @@
 
 #include "PJSipSessionModule.h"
 
+using namespace AsteriskSCF::System::Logging;
+
+namespace
+{
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+}
+
 namespace AsteriskSCF
 {
 
@@ -162,7 +169,7 @@ PJSipSessionModule::~PJSipSessionModule()
     {
         mPoolQueue->shutdown();
     }
-    catch (const ShuttingDown&)
+    catch (const AsteriskSCF::System::WorkQueue::V1::ShuttingDown&)
     {
         lg(Warning) << "Attempted to shut down a Queue that is already shut down.";
     }

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


-- 
asterisk-scf/release/sip.git