ChangeLogTag: Fri Mar 28 09:07:14 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>

1 files changed, 20 insertions, 1 deletions

diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 0674e6e090d..8ebdc4f6ba4 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -356,7 +356,26 @@ namespace TAO
   {
     // The object pointer has to be changed to a TAO_Stub pointer
     // in order to obtain the profiles.
-    TAO_Stub *stubobj = effective_target->_stubobj ();
+    TAO_Stub *stubobj = 0;
+
+    bool nil_forward_ref = false;
+    if (CORBA::is_nil (effective_target))
+      nil_forward_ref = true;
+    else
+      {
+        stubobj =
+          effective_target->_stubobj ();
+
+        if (stubobj && stubobj->base_profiles ().size () == 0)
+          nil_forward_ref = true;
+      }
+
+    if (nil_forward_ref)
+      throw ::CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
+          errno),
+        CORBA::COMPLETED_NO);
 
     if (stubobj == 0)
       throw ::CORBA::INTERNAL (