diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-20 20:12:47 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-20 20:12:47 +0000 |
| commit | e2bf41cc6959959fbe34defed251df143c5a9419 (patch) | |
| tree | b2e464592f92faf58024033d7a0e9c865ae55e89 /TAO/tao/ORB_Core.cpp | |
| parent | e030b2a3e63c168ed82ac004d04b61f5b4b144fb (diff) | |
| download | ATCD-e2bf41cc6959959fbe34defed251df143c5a9419.tar.gz | |
Tue Feb 20 20:10:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/ORB_Core.cpp')
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index bd244a1a38b..f6aef039b2b 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1322,16 +1322,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) (this->configuration (), ACE_TEXT_CHAR_TO_TCHAR (protocols_hooks_name.c_str())); - // Must have valid protocol hooks. - if (this->protocols_hooks_ == 0) - throw ::CORBA::INITIALIZE ( - CORBA::SystemException::_tao_minor_code ( - TAO_ORB_CORE_INIT_LOCATION_CODE, - 0), - CORBA::COMPLETED_NO); - - // Initialize the protocols hooks instance. - this->protocols_hooks_->init_hooks (this); + if (this->protocols_hooks_ != 0) + { + // Initialize the protocols hooks instance. + this->protocols_hooks_->init_hooks (this); + } // Look in the service repository for an instance of the // Network Priority Protocol Hooks. @@ -1797,7 +1792,10 @@ TAO_ORB_Core::service_context_list ( CORBA::Boolean restart) { // @NOTE: Can use Interceptors instead.. - this->protocols_hooks_->rt_service_context (stub, service_context, restart); + if (this->protocols_hooks_ != 0) + { + this->protocols_hooks_->rt_service_context (stub, service_context, restart); + } // call the network priority protocols hooks that has been // registered. |