[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "party-id" updated.

[Commits to the Asterisk SCF project code repositories]

branch "party-id" has been updated
       via  c773b8ab340721d73d9d740ca55d7b61bf288858 (commit)
      from  75f4224efd83163ccbdc3245305ff678610f09ab (commit)

Summary of changes:
 src/BridgeImpl.cpp |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit c773b8ab340721d73d9d740ca55d7b61bf288858
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Oct 14 13:36:39 2011 -0500

    Fix error of trying to use a non-existent SessionWrapperPtr

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 8d6ccda..a4c62be 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -286,7 +286,7 @@ class ForwardRedirectionsUpdatedTask : public QueuedTask
 {
 public:
     ForwardRedirectionsUpdatedTask(const BridgeImplPtr& bridge, 
-            const SessionWrapperPtr& sourceSession,
+            const SessionPrx& sourceSession,
             const RedirectionsPtr& redirections,
             const Logger& logger) :
         QueuedTask("ForwardRedirectionsUpdatedTask"),
@@ -309,7 +309,7 @@ protected:
             for(SessionSeq::iterator i = sessions.begin();
                 i != sessions.end(); ++i)
             {
-                if ((*i)->ice_getIdentity() == mSourceSession->getSession()->ice_getIdentity())
+                if ((*i)->ice_getIdentity() == mSourceSession->ice_getIdentity())
                 {
                     continue;
                 }
@@ -343,7 +343,7 @@ protected:
             try
             {
                 // Apply this hook. 
-                AsteriskSCF::System::Hook::V1::HookResult hookResult = (*i)->modifyForwardingRedirections(mSourceSession->getSession(),
+                AsteriskSCF::System::Hook::V1::HookResult hookResult = (*i)->modifyForwardingRedirections(mSourceSession,
                     destinationSession->getSession(),
                     currentRedirections, destSpecificRedirections);
 
@@ -364,7 +364,7 @@ protected:
 
 private:
     BridgeImplPtr mBridge;
-    SessionWrapperPtr mSourceSession;
+    SessionPrx mSourceSession;
     RedirectionsPtr mRedirections;
     Logger mLogger;
 };
@@ -478,7 +478,7 @@ class ForwardCallerIDTask : public QueuedTask
 {
 public:
     ForwardCallerIDTask(const BridgeImplPtr& bridge, 
-            const SessionWrapperPtr& source,
+            const SessionPrx& source,
             const CallerPtr& callerID,
             const Logger& logger) :
         QueuedTask("ForwardConnectedLineTask"),
@@ -501,7 +501,7 @@ protected:
             for(SessionSeq::iterator i = sessions.begin();
                 i != sessions.end(); ++i)
             {
-                if ((*i)->ice_getIdentity() == mSource->getSession()->ice_getIdentity())
+                if ((*i)->ice_getIdentity() == mSource->ice_getIdentity())
                 {
                     continue;
                 }
@@ -535,7 +535,7 @@ protected:
             try
             {
                 // Apply a hook
-                AsteriskSCF::System::Hook::V1::HookResult hookResult = (*i)->modifyForwardingCaller(mSource->getSession(),
+                AsteriskSCF::System::Hook::V1::HookResult hookResult = (*i)->modifyForwardingCaller(mSource,
                     destinationSession->getSession(),
                     currentCallerID, destSpecificCallerID);
 
@@ -556,7 +556,7 @@ protected:
 
 private:
     BridgeImplPtr mBridge;
-    SessionWrapperPtr mSource;
+    SessionPrx mSource;
     CallerPtr mCallerID;
     Logger mLogger;
 };
@@ -1311,7 +1311,7 @@ void BridgeImpl::updateRedirections(const SessionWrapperPtr& sourceSession, cons
 
         // Forwards the Redirections information to the other sessions in the bridge.
         // Applies forwarding hooks to the Redirecrting info before forwarding.
-        tasks.push_back(new ForwardRedirectionsUpdatedTask(this, sourceSession, redirections, mLogger));
+        tasks.push_back(new ForwardRedirectionsUpdatedTask(this, sourceSession->getSession(), redirections, mLogger));
         ExecutorPtr runner(new Executor(tasks, mLogger));
         runner->start();
     }
@@ -1851,8 +1851,8 @@ void BridgeImpl::getAddSessionsTasks(QueuedTasks& tasks,
     tasks.push_back(new SetBridgeTask(mSessions, mPrx, mSessionListenerPrx, sessions, tracker));
     tasks.push_back(new AddToListeners(mListeners, tracker, getCookies()));
     tasks.push_back(new SetAndGetSessionControllerTask(mObjAdapter, mSessions, sessions, this, mLogger));
-    tasks.push_back(new ForwardCallerIDTask(this, sourceSessionWrapper, callerID, mLogger));
-    tasks.push_back(new ForwardRedirectionsUpdatedTask(this, sourceSessionWrapper, redirects, mLogger));
+    tasks.push_back(new ForwardCallerIDTask(this, source, callerID, mLogger));
+    tasks.push_back(new ForwardRedirectionsUpdatedTask(this, source, redirects, mLogger));
     tasks.push_back(new SetupMedia(this));
     tasks.push_back(new ConnectTelephonyEventsTask(this, sessions, mLogger));
     tasks.push_back(new UpdateTask(this));

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


-- 
asterisk-scf/integration/bridging.git