1 files changed, 83 insertions, 0 deletions
diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
new file mode 100644
index 00000000000..88403f8c7bb
--- /dev/null
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -0,0 +1,83 @@
+/**
+ * @file Client_Task.cpp
+ * @author Will Otte <wotte@dre.vanderbilt.edu
+ *
+ * $Id$
+ *
+ * Implements the Client_Task class defined in Client_Task.h.
+ */
+
+#include "Client_Task.h"
+#include "testC.h"
+#include "Client_ORBInitializer.h"
+
+
+Client_Task::Client_Task (const char *input,
+                          CORBA::ORB_ptr corb,
+                          ACE_Thread_Manager *thr_mgr)
+        : ACE_Task_Base (thr_mgr),
+          input_ (input),
+          corb_ (CORBA::ORB::_duplicate (corb))
+{}
+
+
+int
+Client_Task::svc (void)
+{
+  try
+    {
+      CORBA::Object_var object =
+        corb_->string_to_object (input_);
+
+      Bug1495_Regression::Bug1495_var server =
+        Bug1495_Regression::Bug1495::_narrow (object.in ());
+
+      if (CORBA::is_nil (server.in ()))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "Object reference <%s> is nil\n",
+                      input_));
+
+          return 1;
+        }
+
+      // Try multiple calls to see if we keep being forwarded
+      for (int i = 0; i < 5; i++)
+        {
+          // call the thread_id function on the test object
+          CORBA::Long remote_thread_id;
+
+          server->get_thread_id (remote_thread_id);
+
+          ACE_DEBUG ((LM_INFO,
+                      "Remote thread ID was %i\n",
+                      remote_thread_id));
+
+          CORBA::Long mythread_id =
+            static_cast<CORBA::Long> ((size_t)ACE_Thread::self ());
+          if (mythread_id != remote_thread_id)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          "ERROR:  Failed Bug_1495_Regression test. "
+                          "Expected thread id was %i, received %i.\n",
+                          mythread_id,
+                          remote_thread_id));
+            }
+          else
+            {
+              ACE_DEBUG ((LM_INFO,
+                          "Passed Bug_1495_Regression test.\n"
+                          "Local thread id was %i, received %i.\n",
+                          mythread_id,
+                          remote_thread_id));
+            }
+        }
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception in client task:");
+      return 1;
+    }
+
+  return 0;
+}