summaryrefslogtreecommitdiff
path: root/TAO/tao/RTScheduling/Request_Interceptor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RTScheduling/Request_Interceptor.cpp')
-rw-r--r--TAO/tao/RTScheduling/Request_Interceptor.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 6f5b697bb08..906b6495ce8 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -174,11 +174,24 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
if (current != 0)
{
+ if (ri == 0)
+ {
+ ACE_ERROR ((LM_ERROR,
+ "ri = 0\n"));
+ return;
+ }
CORBA::Any_var ex =
ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CORBA::TypeCode_var type = ex->type ();
+
+ if (CORBA::is_nil (type.in ()))
+ {
+ ACE_ERROR ((LM_ERROR,
+ "type = 0 \n"));
+ return;
+ }
const char * id = type->id ();
if (TAO_debug_level > 0)
@@ -282,8 +295,9 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
ACE_CATCHANY
{
if (TAO_debug_level > 0)
- ACE_DEBUG ((LM_DEBUG,
- "Invalid Service REquest\n"));
+ ACE_DEBUG ((LM_DEBUG,
+ "Invalid Service Request\n"));
+ return;
}
ACE_ENDTRY;
ACE_CHECK;