[asterisk-scf-commits] asterisk-scf/release/sip.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Aug 11 13:25:04 CDT 2011
branch "master" has been updated
via 12f7bb81986f9c7d63a975447fdb7baa6f15e9d3 (commit)
from 5e6d4e5f80325395220a91d5647bf3c795cfa8fd (commit)
Summary of changes:
src/PJSipSessionModule.h | 1 +
src/PJSipSessionModuleConstruction.cpp | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
- Log -----------------------------------------------------------------
commit 12f7bb81986f9c7d63a975447fdb7baa6f15e9d3
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Aug 11 13:25:49 2011 -0500
Use a UUID when adding the session creation extension point to the object adapter.
diff --git a/src/PJSipSessionModule.h b/src/PJSipSessionModule.h
index 27eda44..e641f28 100644
--- a/src/PJSipSessionModule.h
+++ b/src/PJSipSessionModule.h
@@ -162,6 +162,7 @@ private:
AsteriskSCF::System::WorkQueue::V1::QueuePtr mPoolQueue;
AsteriskSCF::System::ThreadPool::V1::PoolListenerPtr mPoolListener;
SipSessionCreationExtensionPointPtr mSessionCreationExtensionPoint;
+ AsteriskSCF::SessionCommunications::ExtensionPoints::V1::SessionCreationExtensionPointPrx mSessionCreationExtensionPointPrx;
Ice::ObjectAdapterPtr mAdapter;
AsteriskSCF::Core::Discovery::V1::ServiceManagementPrx mSessionCreationExtensionPointService;
};
diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index 97d88ee..3d3d5ee 100644
--- a/src/PJSipSessionModuleConstruction.cpp
+++ b/src/PJSipSessionModuleConstruction.cpp
@@ -144,11 +144,10 @@ PJSipSessionModule::PJSipSessionModule(pjsip_endpoint *endpt,
mModule.on_tx_response = NULL;
mModule.on_tsx_state = NULL;
- Ice::ObjectPrx extensionPointObjPrx = mAdapter->add(mSessionCreationExtensionPoint, mAdapter->getCommunicator()->stringToIdentity(SessionCreationExtensionPointId));
- SessionCreationExtensionPointPrx extensionPointPrx =
- SessionCreationExtensionPointPrx::uncheckedCast(extensionPointObjPrx);
+ mSessionCreationExtensionPointPrx =
+ SessionCreationExtensionPointPrx::uncheckedCast(mAdapter->addWithUUID(mSessionCreationExtensionPoint));
- mSessionCreationExtensionPointService = serviceLocatorManagement->addService(extensionPointPrx, SessionCreationExtensionPointId);
+ mSessionCreationExtensionPointService = serviceLocatorManagement->addService(mSessionCreationExtensionPointPrx, SessionCreationExtensionPointId);
// TBD... how to access the Component's service and instance ids.
mSessionCreationExtensionPointService->addLocatorParams(new ServiceLocatorParams(SessionCreationHookLocatorCategory, "default", ""), "");
@@ -196,7 +195,7 @@ PJSipSessionModule::~PJSipSessionModule()
{
mPoolQueue->shutdown();
mSessionCreationExtensionPointService->unregister();
- mAdapter->remove(mAdapter->getCommunicator()->stringToIdentity(SessionCreationExtensionPointId));
+ mAdapter->remove(mSessionCreationExtensionPointPrx->ice_getIdentity());
}
catch (const AsteriskSCF::System::WorkQueue::V1::ShuttingDown&)
{
-----------------------------------------------------------------------
--
asterisk-scf/release/sip.git
More information about the asterisk-scf-commits
mailing list