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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  fa9a1e07919211dbfc754e83161de216639b68d9 (commit)
      from  2427f9532fba64f628e27d152e3139af2755e737 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp   |    2 --
 src/SipChannelServiceApp.cpp |   24 ------------------------
 2 files changed, 0 insertions(+), 26 deletions(-)


- Log -----------------------------------------------------------------
commit fa9a1e07919211dbfc754e83161de216639b68d9
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Oct 12 15:14:47 2010 -0500

    Remove unnecessary BridgeManager acquisition at startup.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 08a7569..2e9ee0c 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -9,7 +9,6 @@
 
 #include <Core/Endpoint/EndpointIf.h>
 #include <Core/Routing/RoutingIf.h>
-#include <SessionCommunications/Bridging/BridgingIf.h>
 #include <SessionCommunications/SessionCommunicationsIf.h>
 #include <Media/MediaIf.h>
 
@@ -35,7 +34,6 @@ namespace SipChannelService
 {
 
 using namespace AsteriskSCF::Core::Routing::V1;
-using namespace AsteriskSCF::SessionCommunications::Bridging::V1;
 using namespace AsteriskSCF::Core::Endpoint::V1;
 using namespace AsteriskSCF::SessionCommunications::V1;
 using namespace AsteriskSCF::Media::V1;
diff --git a/src/SipChannelServiceApp.cpp b/src/SipChannelServiceApp.cpp
index 561af7f..49d259d 100644
--- a/src/SipChannelServiceApp.cpp
+++ b/src/SipChannelServiceApp.cpp
@@ -18,7 +18,6 @@
 #include "RoutingIf.h"
 #include "ServiceLocatorIf.h"
 #include "ComponentServiceIf.h"
-#include "BridgingIf.h"
 #include "SessionCommunicationsIf.h"
 #include "ReplicaIf.h"
 #include "IceLogger.h"
@@ -79,7 +78,6 @@ private:
    void locateRoutingService();
    void locateSessionRouter();
    void locateStateReplicator();
-   void locateBridgeService();
    void registerWithRoutingService();
    void deregisterFromRoutingService();
    void configureEndpoints();
@@ -109,7 +107,6 @@ private:
    SipStateReplicatorPrx mStateReplicator;
    AsteriskSCF::SessionCommunications::V1::SessionRouterPrx mSessionRouter;
    Routing::V1::LocatorRegistryPrx mRoutingServiceLocatorRegistry;
-   Bridging::V1::BridgeManagerPrx mBridgeManager;
    boost::shared_ptr<SipChannelServiceEventPublisher> mEventPublisher;
    Routing::V1::EndpointLocatorPtr mEndpointLocator;
 };
@@ -397,24 +394,6 @@ void SipChannelService::locateSessionRouter()
 }
 
 /**
- * Get a reference to the Bridge Service interface and cache it in the Data Model.
- * This will allow us to create bridges as needed.
- */
-void SipChannelService::locateBridgeService()
-{
-   if (mServiceLocator == 0)
-   {
-      mServiceLocator = ServiceLocatorPrx::checkedCast(mCommunicator->propertyToProxy("LocatorService.Proxy"));
-   }
-
-   ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
-   // genericparams->category = Bridging::V1::BridgeServiceDiscoveryCategory;
-
-   Ice::ObjectPrx objectPrx = mServiceLocator->locate(genericparams);
-   mBridgeManager = Bridging::V1::BridgeManagerPrx::checkedCast(objectPrx);
-}
-
-/**
  * Deregister this component's primary public interfaces from the Service Locator.
  * This is done at shutdown, and whenever we want to keep other services from locating
  * our interfaces.
@@ -578,9 +557,6 @@ void SipChannelService::start(const string& name, const Ice::CommunicatorPtr& ic
    // Register our Endpoint Locator so that we can provide endpoints to the
    // Routing Service for the endpoints we manage.
    registerWithRoutingService();
-
-   // Locate the Bridge Service so that we can create bridges.
-   locateBridgeService();
 }
 
 void SipChannelService::stop()

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


-- 
asterisk-scf/integration/sip.git