[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "sessioncontroller" updated.

[Commits to the Asterisk SCF project code repositories]

branch "sessioncontroller" has been updated
       via  2697abafb9071200a2d3074e0533db1c7df9925d (commit)
      from  57a4c6202d356e944d6ed630fb4da5e9ef6e0ad2 (commit)

Summary of changes:
 .../SessionCommunicationsIf.ice                    |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 2697abafb9071200a2d3074e0533db1c7df9925d
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Jul 22 22:20:45 2011 -0300

    Add an exception which is thrown when setAndGetSessionController is called and a session controller is already set.

diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 042a555..f45df3e 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -314,6 +314,11 @@ module V1
     exception NotBridged { };
 
     /**
+     * Exception used to indicate that a SessionController is already set on a session.
+     */
+    exception ControllerAlreadySet { };
+
+    /**
      * A SessionController interface which is used to invoke critical operations
      * relating to a session. This is implemented by external components so they can
      * be controlled by a session and is also implemented by a session so it can be
@@ -533,9 +538,12 @@ module V1
          * @return SessionController* A proxy to the session controller implemented by
          *       the session.
          *
+         * @throws ControllerAlreadySet if a controller is present already.
+         *
          * @see SessionController
          */
-        ["amd"] SessionController *setAndGetSessionController(SessionController* controller);
+        ["amd"] SessionController *setAndGetSessionController(SessionController* controller) throws
+            ControllerAlreadySet;
 
         /**
          * Method which removes a session controller from a session.

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


-- 
asterisk-scf/integration/slice.git