diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-28 19:11:47 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-28 19:11:47 +0000 |
| commit | 4b85c9e5ecdb495d571f210c2d8ccd59382a25c7 (patch) | |
| tree | d90057814426ac142e80af64a06b1e72d7413761 /TAO/tao | |
| parent | 6a531b8012a4458f71ffb21bfc8e1749a62ed303 (diff) | |
| download | ATCD-4b85c9e5ecdb495d571f210c2d8ccd59382a25c7.tar.gz | |
ChangeLogTag:Tue Oct 28 13:11:03 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Invocation_Adapter.h | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Service_Callbacks.cpp | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 130b40ab805..6ac4d551091 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -11,8 +11,8 @@ //============================================================================= #ifndef TAO_INVOCATION_ADAPTER_H #define TAO_INVOCATION_ADAPTER_H - #include /**/ "ace/pre.h" + #include "ace/Global_Macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -53,7 +53,7 @@ namespace TAO * * The main objective of this class is to adapt the type and * invocation specific information declared in the IDL by the - * application and convert them as CORBA invocations to the remote + * application and convert them as CORBA invocations to the target * object. * * @@ More info.. diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index b81779e8967..3fc815d7b9c 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -873,7 +873,7 @@ CORBA::ORB::create_component_tc ( if (adapter == 0) { ACE_THROW_RETURN (CORBA::INTERNAL (), - CORBA::TypeCode::_nil ()); + 0); } return adapter->create_component_tc (id, @@ -924,7 +924,7 @@ CORBA::ORB::create_event_tc ( if (adapter == 0) { ACE_THROW_RETURN (CORBA::INTERNAL (), - CORBA::TypeCode::_nil ()); + 0); } return adapter->create_event_tc (id, diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index c902dac7363..80f905477e9 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -2,6 +2,7 @@ #include "ORB_Constants.h" #include "Exception.h" #include "Environment.h" +#include "Invocation_Utils.h" #if !defined (__ACE_INLINE__) # include "tao/Service_Callbacks.i" @@ -70,7 +71,7 @@ TAO_Service_Callbacks::raise_comm_failure ( TAO_INVOCATION_RECV_REQUEST_MINOR_CODE, -1), CORBA::COMPLETED_MAYBE), - 2); + TAO::TAO_INVOKE_FAILURE); } TAO::Invocation_Status @@ -84,5 +85,5 @@ TAO_Service_Callbacks::raise_transient_failure ( TAO_INVOCATION_RECV_REQUEST_MINOR_CODE, -1), CORBA::COMPLETED_MAYBE), - 2); + TAO::TAO_INVOKE_FAILURE); } |