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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  4154f9e5ad5f9cf58f4fd0eb95a3e0083d931229 (commit)
      from  c6dcc99f83464fda6886bec7d8698d742952d5e3 (commit)

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


- Log -----------------------------------------------------------------
commit 4154f9e5ad5f9cf58f4fd0eb95a3e0083d931229
Author: Brent Eagles <beagles at digium.com>
Date:   Thu May 19 17:16:06 2011 -0230

    Fix a bug in the connection follow through logic if replication isn't enabled.

diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
index ac30477..db2b255 100644
--- a/src/SessionWrapper.cpp
+++ b/src/SessionWrapper.cpp
@@ -365,17 +365,19 @@ void SessionWrapper::ring()
 bool SessionWrapper::setConnected()
 {
     mLogger(Debug) << FUNLOG << " for " << mId;
+    bool makingConnected = false;
     BridgedSessionPtr stateUpdate;
     {
         boost::unique_lock<boost::shared_mutex> lock(mLock);
         if (mSession->currentState == Added)
         {
             mSession->currentState = Connected;
+            makingConnected = true;
             stateUpdate = createUpdate();
         }
     }
     pushUpdate(stateUpdate);
-    return (stateUpdate != 0);
+    return makingConnected;
 }
 
 BridgedSessionPtr SessionWrapper::getBridgedSession() const

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


-- 
asterisk-scf/release/bridging.git