2 files changed, 4 insertions, 0 deletions
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 57ccd751087..0b511b6e288 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -445,6 +445,8 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous,
 
       this->endpoint_->reset_hint ();
 
+      this->restart_flag_ = 1;
+
       return TAO_INVOKE_RESTART;
     }
 
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 109904cfb81..8e7c7f0eb4b 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -90,6 +90,8 @@ TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj,
   ACE_CHECK;
 
   this->received_location_forward_ = 1;
+
+  this->restart_flag_ = 1;
 }
 
 // ****************************************************************