diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-12-09 13:30:06 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-12-09 13:30:06 +0000 |
| commit | 0b923613c4665fe54f7aab8ce89a81f98cceb2e7 (patch) | |
| tree | f859868662139184410edc58ed9a5913cc433cae | |
| parent | 874751bd5c75be54dee3ec67d83b4ca801821a16 (diff) | |
| download | ATCD-0b923613c4665fe54f7aab8ce89a81f98cceb2e7.tar.gz | |
Thu Dec 9 13:26:48 UTC 2010 Martin Corino <corino_m@remedy.nl>
* ciao/Containers/Extension/Extension_Container.cpp:
* ciao/Containers/Session/Session_Container.cpp:
Added code to ignore the CookieRequired exception at shutdown and log
only at a higher log level.
This will be reverted after the disconnect behaviour has been properly
fixed.
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/ciao/Containers/Extension/Extension_Container.cpp | 16 | ||||
| -rw-r--r-- | CIAO/ciao/Containers/Session/Session_Container.cpp | 16 |
3 files changed, 39 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index fd675fa69c9..dfe49e6c3e9 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Dec 9 13:26:48 UTC 2010 Martin Corino <corino_m@remedy.nl> + + * ciao/Containers/Extension/Extension_Container.cpp: + * ciao/Containers/Session/Session_Container.cpp: + Added code to ignore the CookieRequired exception at shutdown and log + only at a higher log level. + This will be reverted after the disconnect behaviour has been properly + fixed. + Thu Dec 9 10:02:03 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.idl: diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.cpp b/CIAO/ciao/Containers/Extension/Extension_Container.cpp index 0f5410ce506..7677ccbff40 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.cpp +++ b/CIAO/ciao/Containers/Extension/Extension_Container.cpp @@ -796,7 +796,21 @@ namespace CIAO // Note: Spec says that facet executor provided by component MAY BE NIL if (!::CORBA::is_nil (exec.in ())) { - ::CORBA::Object_var port = user_serv->disconnect (user_port, 0); + try + { + ::CORBA::Object_var port = user_serv->disconnect (user_port, 0); + } + catch (const ::Components::CookieRequired&ex) + { + CIAO_ERROR (6, + (LM_ERROR, + CLINFO + "Extension_Container_i::disconnect_local_facet - " + "Ingnoring exception %C.\n", + ex._info ().c_str ())); + + // mcorino@remedy.nl - Ignore this for now; disconnect behaviour will be fixed properly + } } else { diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp index 2e7049c661c..6a3303b2f34 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -735,7 +735,21 @@ namespace CIAO throw ::Components::InvalidConnection (); } - ::CORBA::Object_var port = user_serv->disconnect (user_port, 0); + try + { + ::CORBA::Object_var port = user_serv->disconnect (user_port, 0); + } + catch (const ::Components::CookieRequired&ex) + { + CIAO_ERROR (6, + (LM_ERROR, + CLINFO + "Session_Container_i::disconnect_local_facet - " + "Ingnoring exception %C.\n", + ex._info ().c_str ())); + + // mcorino@remedy.nl - Ignore this for now; disconnect behaviour will be fixed properly + } } catch (const ::Components::InvalidConnection &) { |