[hydra-commits] hydra/slice.git branch "master" updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  3caf6332202c33bc3d48d676260bf9a3e1edde9f (commit)
      from  aedc8c12e431ba663550f722ad8ab1479535590e (commit)

Summary of changes:
 Core/Bridging/BridgeServiceIf.ice |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit 3caf6332202c33bc3d48d676260bf9a3e1edde9f
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Aug 10 04:21:16 2010 -0230

    Add new exception

diff --git a/Core/Bridging/BridgeServiceIf.ice b/Core/Bridging/BridgeServiceIf.ice
index 139e65b..f701253 100644
--- a/Core/Bridging/BridgeServiceIf.ice
+++ b/Core/Bridging/BridgeServiceIf.ice
@@ -24,6 +24,15 @@ module V1
    };
 
    /**
+    * Occurs if two endpoints being added to a bridge collide in some way, including media conflicts, etc.
+    */
+   exception EndpointCollision
+   {
+       Endpoint::V1::EndpointId first;
+       Endpoint::V1::EndpointId second;
+   };
+
+   /**
     * EndpointAlreadyRegistered indicates that an attempt to register an ep
     * has failed because it was registered already.
     */

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


-- 
hydra/slice.git