[asterisk-scf-commits] asterisk-scf/integration/media_operations_core.git branch "pjlib-thread-hook" updated.

[Commits to the Asterisk SCF project code repositories]

branch "pjlib-thread-hook" has been updated
       via  a6be47b1336fe2d6b5789509d3ea1ff5813b6ab0 (commit)
      from  8f7afe7a822e203a6c0a0e043b7eabcdb7bc2b4a (commit)

Summary of changes:
 src/MediaOperationsCore.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit a6be47b1336fe2d6b5789509d3ea1ff5813b6ab0
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Sep 28 13:47:58 2011 -0500

    * Removed trailing whitespace from various lines.
    * Added "Ice" group descriptor to ThreadHook constructor call.

diff --git a/src/MediaOperationsCore.cpp b/src/MediaOperationsCore.cpp
index ed19c44..edaec40 100644
--- a/src/MediaOperationsCore.cpp
+++ b/src/MediaOperationsCore.cpp
@@ -121,7 +121,7 @@ private:
         factory->setProxy(factoryProxy);
         mFactories.push_back(std::make_pair(factory, factoryProxy));
     }
-    
+
     void createOperationFactories()
     {
         lg(Debug) << "Creating UlawAlawFactory";
@@ -152,7 +152,7 @@ private:
         try
         {
             AsteriskSCF::Discovery::SmartProxy<MediaOperationStateReplicatorPrx> pw(getServiceLocator(), params, lg);
-            MediaOperationReplicationContextPtr context = 
+            MediaOperationReplicationContextPtr context =
                 boost::static_pointer_cast<MediaOperationReplicationContext>(getReplicationContext());
 
             context->setReplicator(pw);
@@ -181,19 +181,19 @@ private:
                         iter->first->getName(),
                         iter->first->getLocatorParams(),
                         iter->first->getName()));
-            
+
             managePrimaryService(wrapper);
         }
     }
 
     // Below are overrides of the base component class.
-    
+
     void onPreInitialize()
     {
         try
         {
             Ice::InitializationData id;
-            id.threadHook = new AsteriskSCF::PJLib::ThreadHook();
+            id.threadHook = new AsteriskSCF::PJLib::ThreadHook("Ice");
             id.properties = getCommunicator()->getProperties();
 
             setCommunicator(Ice::initialize(id));
@@ -244,7 +244,7 @@ private:
 
         MediaOperationStateReplicatorListenerPrx replicatorListener =
             MediaOperationStateReplicatorListenerPrx::uncheckedCast(getBackplaneAdapter()->addWithUUID(mReplicatorListener));
-        
+
         mReplicatorListenerProxy = MediaOperationStateReplicatorListenerPrx::uncheckedCast(replicatorListener->ice_oneway());
     }
 
@@ -264,7 +264,7 @@ private:
         }
 
         try
-        { 
+        {
             if (context->getState() == STANDBY_IN_REPLICA_GROUP)
             {
                 context->getReplicator()->addListener(mReplicatorListenerProxy);
@@ -280,14 +280,14 @@ private:
 
     void stopListeningToStateReplicators()
     {
-        MediaOperationReplicationContextPtr context = 
+        MediaOperationReplicationContextPtr context =
             boost::static_pointer_cast<MediaOperationReplicationContext>(getReplicationContext());
-    
+
         if ((!context->getReplicator().isInitialized()) || (mListeningToReplicator == false))
         {
             return;
         }
-    
+
         try
         {
             context->getReplicator()->removeListener(mReplicatorListenerProxy);

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


-- 
asterisk-scf/integration/media_operations_core.git