diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-02 13:19:28 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-02 13:19:28 +0000 |
| commit | 4104cb939aa6bcd5b2560a87d9b2a0a84914dcda (patch) | |
| tree | f749fe4a90e00c82a981ad1dc1202d9e18d1d95f | |
| parent | b8329f7d98a819e0ba118e563d1106741b22b08f (diff) | |
| download | ATCD-4104cb939aa6bcd5b2560a87d9b2a0a84914dcda.tar.gz | |
Tue Apr 2 13:17:44 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog_Asynch_ImR | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp | 18 |
2 files changed, 10 insertions, 14 deletions
diff --git a/TAO/ChangeLog_Asynch_ImR b/TAO/ChangeLog_Asynch_ImR index 3fa33dfefd0..f946db81daa 100644 --- a/TAO/ChangeLog_Asynch_ImR +++ b/TAO/ChangeLog_Asynch_ImR @@ -1,3 +1,9 @@ +Tue Apr 2 13:17:44 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Forwarder.cpp: + + Nightly build cleanup. + Tue Apr 2 01:37:35 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index e65a268da82..be164a29db3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -210,12 +210,6 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) ior += this->key_str_.in(); - if (this->server_name_[0] != 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ImR_DSI_ResponseHandler::send_ior(): Forwarding invocation ") - ACE_TEXT ("on <%s> to <%s>\n"), - this->server_name_.in(), ior.c_str())); - CORBA::Object_var forward_obj = this->orb_->string_to_object (ior.c_str ()); @@ -244,14 +238,10 @@ ImR_DSI_ResponseHandler::send_ior (const char *pior) void ImR_DSI_ResponseHandler::send_exception (CORBA::Exception *) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("ImR_DSI_ResponseHandler::send_exception() ") - ACE_TEXT ("on <%s>\n"), - this->server_name_.in())); - CORBA::TRANSIENT ex (CORBA::SystemException::_tao_minor_code - ( TAO_IMPLREPO_MINOR_CODE, 0), - CORBA::COMPLETED_NO); - TAO_AMH_DSI_Exception_Holder h(&ex); + CORBA::Exception *ex = new CORBA::TRANSIENT (CORBA::SystemException::_tao_minor_code + ( TAO_IMPLREPO_MINOR_CODE, 0), + CORBA::COMPLETED_NO); + TAO_AMH_DSI_Exception_Holder h(ex); resp_->invoke_excep(&h); delete this; } |