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

[Commits to the Asterisk SCF project code repositories]

branch "bridge_creation_extension_points" has been updated
       via  7b954540616dcb1f81bbb68e0e78e4549064d26d (commit)
      from  ee693b45f59ee8f80bcab96ed09b41bbab236d84 (commit)

Summary of changes:
 src/BridgeCreationExtensionPointImpl.cpp |    2 +-
 src/BridgeImpl.cpp                       |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 7b954540616dcb1f81bbb68e0e78e4549064d26d
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Aug 12 13:00:08 2011 -0230

    Fix shadow compile error and a bogus
    assignment-which-should-have-been-an-equality  operator.

diff --git a/src/BridgeCreationExtensionPointImpl.cpp b/src/BridgeCreationExtensionPointImpl.cpp
index 084c48c..bc7c01e 100755
--- a/src/BridgeCreationExtensionPointImpl.cpp
+++ b/src/BridgeCreationExtensionPointImpl.cpp
@@ -83,7 +83,7 @@ namespace
                 {
                     BridgeCreationHookDataPtr resultData; 
                     HookResult result = (*i)->execute(tokenData, resultData);
-                    if (result.status = AsteriskSCF::System::Hook::V1::Succeeded)
+                    if (result.status == AsteriskSCF::System::Hook::V1::Succeeded)
                     {
                         tokenData = resultData;
                     }
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index ed88cec..5580aac 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -960,13 +960,13 @@ void BridgeImpl::shutdownImpl(const Ice::Current& current)
     shutdown(current);
 }
 
-void BridgeImpl::activate(const BridgePrx& proxy, const std::string& id)
+void BridgeImpl::activate(const BridgePrx& proxy, const std::string& bridgeId)
 {
     mPrx = proxy;
     mState->publishedBridge = proxy;
-    mState->key = id;
-    mState->bridgeId = id;
-    string listenerId = id + ".sessionListener"; 
+    mState->key = bridgeId;
+    mState->bridgeId = bridgeId;
+    string listenerId = bridgeId + ".sessionListener"; 
     mLogger(Debug) << FUNLOG << " : activating session listener with " << listenerId;
     mActivated = true;
     mSessionListenerPrx =

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


-- 
asterisk-scf/integration/bridging.git