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

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  81ad1b1dbdd5c64ca3588fa3b54c98ca66505767 (commit)
      from  b0bd266487b0f665edcac1cc784b7a09e2654e52 (commit)

Summary of changes:
 src/InbandTelephonyEvents.cpp      |    7 ++++++-
 src/TranslatorOperationFactory.cpp |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 81ad1b1dbdd5c64ca3588fa3b54c98ca66505767
Author: David M. Lee <dlee at digium.com>
Date:   Thu Mar 22 15:39:50 2012 -0500

    Store all exceptions in the cookie; not just Ice exceptions.

diff --git a/src/InbandTelephonyEvents.cpp b/src/InbandTelephonyEvents.cpp
index bf4174b..8f1b754 100644
--- a/src/InbandTelephonyEvents.cpp
+++ b/src/InbandTelephonyEvents.cpp
@@ -407,11 +407,16 @@ MediaOperationPrx InbandTelephonyEventOperationFactory::createMediaOperation(
         cookie->set(proxy);
         return proxy;
     }
-    catch (const IceUtil::Exception& e)
+    catch (const std::exception& e)
     {
         cookie->setException(e);
         throw;
     }
+    catch (...)
+    {
+        cookie->setException();
+        throw;
+    }
 }
 
 MediaOperationPrx InbandTelephonyEventOperationFactory::tryFormat(const FormatSeq& sourceFormats,
diff --git a/src/TranslatorOperationFactory.cpp b/src/TranslatorOperationFactory.cpp
index 504c4ce..8c0100e 100644
--- a/src/TranslatorOperationFactory.cpp
+++ b/src/TranslatorOperationFactory.cpp
@@ -114,11 +114,16 @@ MediaOperationPrx TranslatorOperationFactory::createMediaOperation(
         cookie->set(r);
         return r;
     }
-    catch (const Ice::Exception& e)
+    catch (const std::exception& e)
     {
         cookie->setException(e);
         throw;
     }
+    catch (...)
+    {
+        cookie->setException();
+        throw;
+    }
 }
 
 void TranslatorOperationFactory::addTranslation(

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


-- 
asterisk-scf/integration/media_operations_core.git