[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "registrar" updated.

[Commits to the Asterisk SCF project code repositories]

branch "registrar" has been updated
       via  34797f06098f619838f094d9af7ec1a8c3ad4724 (commit)
      from  cfa23a3f19760c5266a9f4be0ad9302c977bfe8a (commit)

Summary of changes:
 src/PJSipManager.cpp         |    2 +-
 src/PJSipRegistrarModule.cpp |   15 +++++----------
 src/SipSessionManagerApp.cpp |   14 +++++---------
 3 files changed, 11 insertions(+), 20 deletions(-)


- Log -----------------------------------------------------------------
commit 34797f06098f619838f094d9af7ec1a8c3ad4724
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Jun 22 13:24:46 2011 -0500

    Address comments in crucible.

diff --git a/src/PJSipManager.cpp b/src/PJSipManager.cpp
index 85b157b..bd1052a 100644
--- a/src/PJSipManager.cpp
+++ b/src/PJSipManager.cpp
@@ -24,7 +24,7 @@ using namespace AsteriskSCF::System::Logging;
 namespace
 {
 Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
-const std::string& RegistrarId("SipRegistrar");
+const std::string RegistrarId("SipRegistrar");
 }
 
 
diff --git a/src/PJSipRegistrarModule.cpp b/src/PJSipRegistrarModule.cpp
index 4bc48df..dd6be8c 100644
--- a/src/PJSipRegistrarModule.cpp
+++ b/src/PJSipRegistrarModule.cpp
@@ -106,9 +106,8 @@ void BindingWrapper::updateBinding(const std::string &callID, int cSeq, int expi
 
 RegistrarI::RegistrarI(const RegistrarListenerPrx& defaultListener)
 {
-    Ice::Current barf;
     lg(Debug) << "In RegistrarI constructor, should be adding a listener...";
-    addListener(defaultListener, barf);
+    mListeners.push_back(defaultListener);
 }
 
 ContactDict RegistrarI::addListener(const RegistrarListenerPrx& listener, const Ice::Current&)
@@ -162,11 +161,7 @@ BindingSeq RegistrarI::getAORBindings(const std::string &aor, const Ice::Current
         }
         return bindings;
     }
-    else
-    {
-        BindingSeq empty;
-        return empty;
-    }
+    return BindingSeq();
 }
 
 static BindingWrapperSeq Empty;
@@ -210,9 +205,9 @@ BindingDict RegistrarI::createBindingDict(const std::string& aor, const BindingW
 
 void PJSipRegistrarModule::replicateState(
         const std::string &aor,
-        BindingWrapperSeq& existingBindings,
-        BindingWrapperSeq& newBindings,
-        BindingWrapperSeq& removedBindings)
+        const BindingWrapperSeq& existingBindings,
+        const BindingWrapperSeq& newBindings,
+        const BindingWrapperSeq& removedBindings)
 {
     try
     {
diff --git a/src/SipSessionManagerApp.cpp b/src/SipSessionManagerApp.cpp
index 15a9977..3eaff42 100644
--- a/src/SipSessionManagerApp.cpp
+++ b/src/SipSessionManagerApp.cpp
@@ -74,15 +74,7 @@ class SipSessionManager : public IceBox::Service
 {
 public:
     SipSessionManager() : mDone(false) {}
-    ~SipSessionManager()
-    {
-        // Smart pointers do your thing.
-        mReplicaService = 0;
-        mComponentService = 0;
-	mConfigurationService = 0;
-        mGlobalAdapter = 0;
-        mLocalAdapter = 0;
-    }
+    ~SipSessionManager() { }
 
 public:
     // Overloads of IceBox::Service
@@ -609,6 +601,10 @@ void SipSessionManager::initialize(const string& appName, const Ice::Communicato
         configureEndpoints();
         lg(Debug) << "Endpoints configured";
     }
+    catch(const Ice::Exception& ex)
+    {
+        lg(Critical) << "Caught exception during initialization: " << ex.what();
+    }
     catch(...)
     {
         lg(Critical) << "Major problems in " << mAppName << " initialization()";

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


-- 
asterisk-scf/integration/sip.git