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

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  ac6ae19f779a3bcc2af529069effd055f3565b18 (commit)
      from  688d564b2ca9657fbaf32e4d4984505e49531de8 (commit)

Summary of changes:
 config/test_bridging.conf |    3 ++-
 src/OperationMonitor.h    |    3 ++-
 test/CMakeLists.txt       |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit ac6ae19f779a3bcc2af529069effd055f3565b18
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Mar 22 13:17:43 2012 -0230

    Fix a build gaff in the test suite and uncomment (and fix) code in AMD
    callback proxy factory.

diff --git a/config/test_bridging.conf b/config/test_bridging.conf
index 2854d81..14bd200 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf
@@ -20,7 +20,8 @@ IceBox.InheritProperties=1
 # It's important to specify a reasonable size for the client thread pool for services
 # that use AMI/AMD
 # 
-Ice.ThreadPool.Client.Size=4
+Ice.ThreadPool.Client.Size=10
+Ice.ThreadPool.Server.Size=10
 
 ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
 ServiceDiscovery.IceStorm.TopicManager.ThreadPool.Size=4
diff --git a/src/OperationMonitor.h b/src/OperationMonitor.h
index bbc63d2..5e903d8 100755
--- a/src/OperationMonitor.h
+++ b/src/OperationMonitor.h
@@ -399,7 +399,8 @@ public:
             IceUtil::Mutex::Lock lock(mLock);
             if (!mAMDProxy)
             {
-//                mAMDProxy = new AMDProxy<RT, CB>(ed_from_this());
+                mAMDProxy = new AMDProxy<RT, CB>(
+                    boost::dynamic_pointer_cast<AMDContextResultData<RT, CB> >(shared_from_this()));
             }
         }
         return mAMDProxy;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index eae777d..ef7fc92 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,6 +34,7 @@ astscf_component_add_files(BridgeUnitTests ../src/MediaSplicer.cpp)
 astscf_component_add_files(BridgeUnitTests ../src/MediaMixer.cpp)
 astscf_component_add_files(BridgeUnitTests ../src/BridgeListenerMgr.cpp)
 astscf_component_add_files(BridgeUnitTests ../src/SessionListener.cpp)
+astscf_component_add_files(BridgeUnitTests ../src/OperationMonitor.cpp)
 astscf_component_add_slices(BridgeUnitTests PROJECT AsteriskSCF/Replication/BridgeService/BridgeReplicatorIf.ice)
 astscf_component_add_files(BridgeUnitTests UnitTests.cpp)
 astscf_component_add_ice_libraries(BridgeUnitTests Ice)

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


-- 
asterisk-scf/integration/bridging.git