ChangelogTag: Mon Aug 18 14:33:45 2003 Yamuna Krishnamurthy <yamuna@oomworks.com>

13 files changed, 42 insertions, 21 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;
diff --git a/TAO/tests/RTScheduling/Current/Makefile b/TAO/tests/RTScheduling/Current/Makefile
index 74b1356205e..ff5e67e122d 100644
--- a/TAO/tests/RTScheduling/Current/Makefile
+++ b/TAO/tests/RTScheduling/Current/Makefile
@@ -13,7 +13,7 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 LIBS = -lACE -lTAO -lTAO_RTScheduler
-BIN_UNCHECKED = test
+BIN_UNCHECKED = Current
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED))            
 
@@ -45,7 +45,7 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
-test: $(addprefix $(VDIR),$(CLIENT_OBJS))
+Current: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
 
 realclean: clean
diff --git a/TAO/tests/RTScheduling/Current/run_test.pl b/TAO/tests/RTScheduling/Current/run_test.pl
index 77e69094dca..74e5d5d0895 100755
--- a/TAO/tests/RTScheduling/Current/run_test.pl
+++ b/TAO/tests/RTScheduling/Current/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$CL = new PerlACE::Process ("test", "");
+$CL = new PerlACE::Process ("Current", "");
 
 print STDERR "Starting Current Test\n";
 
diff --git a/TAO/tests/RTScheduling/DT_Spawn/Makefile b/TAO/tests/RTScheduling/DT_Spawn/Makefile
index 5d4a6b890a7..1525dc8ce47 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Makefile
+++ b/TAO/tests/RTScheduling/DT_Spawn/Makefile
@@ -13,7 +13,7 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 LIBS = -lTAO_RTScheduler
-BIN_UNCHECKED = test 
+BIN_UNCHECKED = DT_Spawn
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED))            
 
@@ -45,7 +45,7 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
-test: $(addprefix $(VDIR),$(CLIENT_OBJS))
+DT_Spawn: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
 
 realclean: clean
diff --git a/TAO/tests/RTScheduling/DT_Spawn/run_test.pl b/TAO/tests/RTScheduling/DT_Spawn/run_test.pl
index 77e69094dca..82543832db9 100755
--- a/TAO/tests/RTScheduling/DT_Spawn/run_test.pl
+++ b/TAO/tests/RTScheduling/DT_Spawn/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$CL = new PerlACE::Process ("test", "");
+$CL = new PerlACE::Process ("DT_Spawn", "");
 
 print STDERR "Starting Current Test\n";
 
diff --git a/TAO/tests/RTScheduling/DT_Spawn/test.cpp b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
index 37ae479a3f1..3e4535a91c8 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -68,7 +68,7 @@ main (int argc, char* argv [])
       ACE_CATCH (CORBA::BAD_INV_ORDER, thr_ex)
 	{
 	  ACE_DEBUG ((LM_DEBUG,
-		      "Spawn should be in the context of a Scheduling Segment\n"));
+		      "Spawn should be in the context of a Scheduling Segment - Expected Exception\n"));
 	}
       ACE_CATCHANY
 	{
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile
index 49bcad28ac9..c20ee31f97e 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
 IDL_FILES = test
 IDL_SRC = testC.cpp testS.cpp 
 LIBS = -lTAO_RTScheduler
-BIN_UNCHECKED = test_client test_server
+BIN_UNCHECKED = Scheduler_Interceptor_Client Scheduler_Interceptor_Server
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED)) $(IDL_SRC) ../Scheduler.cpp
 
@@ -49,10 +49,10 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
-test_client: $(addprefix $(VDIR),$(CLIENT_OBJS))
+Scheduler_Interceptor_Client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
 
-test_server: $(addprefix $(VDIR),$(SERVER_OBJS))
+Scheduler_Interceptor_Server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(POSTLINK)
 
 realclean: clean
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
index 76ce9267c1e..a98ecea7e6e 100755
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
@@ -13,8 +13,8 @@ use PerlACE::Run_Test;
 $sleeptime = 2;
 $status = 0;
 
-$SV = new PerlACE::Process ("test_server", "-f test.ior");
-$CL = new PerlACE::Process ("test_client", "-f test.ior");
+$SV = new PerlACE::Process ("Scheduler_Interceptor_Server", "-f test.ior");
+$CL = new PerlACE::Process ("Scheduler_Interceptor_Client", "-f test.ior");
 
 print STDERR "Starting Server\n";
 
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index 11ee4f31158..2425add5984 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -111,15 +111,22 @@ main (int argc, char* argv [])
       ACE_TRY_CHECK;
 
     }
+  ACE_CATCH (CORBA::THREAD_CANCELLED, thr_ex)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+		  "Distributable Thread Cancelled - Expected Exception\n"));
+      server->shutdown ();
+    }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Caught exception:");
-      server->shutdown ();
 
       return 0;
     }
   ACE_ENDTRY;
 
+  orb->destroy ();
+
   return 0;
 }
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Makefile b/TAO/tests/RTScheduling/Thread_Cancel/Makefile
index 71cdeabbec5..a1ca42fd3cf 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Makefile
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Makefile
@@ -13,7 +13,7 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 LIBS = -lTAO_RTScheduler
-BIN_UNCHECKED = test
+BIN_UNCHECKED = Thread_Cancel
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED))            
 
@@ -45,7 +45,7 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
-test: $(addprefix $(VDIR),$(CLIENT_OBJS))
+Thread_Cancel: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
 
 realclean: clean
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl b/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl
index bc54e5f3220..5ada18e5e36 100755
--- a/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl
+++ b/TAO/tests/RTScheduling/Thread_Cancel/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$CL = new PerlACE::Process ("test", "");
+$CL = new PerlACE::Process ("Thread_Cancel", "");
 
 print STDERR "Starting Current Test\n";
 
diff --git a/TAO/tests/RTScheduling/VoidData/Makefile b/TAO/tests/RTScheduling/VoidData/Makefile
index 28ed4c5d6f0..433ad58120a 100644
--- a/TAO/tests/RTScheduling/VoidData/Makefile
+++ b/TAO/tests/RTScheduling/VoidData/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN_UNCHECKED = test_client
+BIN_UNCHECKED = VoidData
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED))
 
@@ -46,7 +46,7 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-test_client: $(addprefix $(VDIR),$(CLIENT_OBJS))
+VoidData: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
 
 realclean: clean
diff --git a/TAO/tests/RTScheduling/VoidData/run_test.pl b/TAO/tests/RTScheduling/VoidData/run_test.pl
index 7a1e77fa652..4ac511bcbdd 100755
--- a/TAO/tests/RTScheduling/VoidData/run_test.pl
+++ b/TAO/tests/RTScheduling/VoidData/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$CL = new PerlACE::Process ("test_client", "");
+$CL = new PerlACE::Process ("VoidData", "");
 
 print STDERR "Starting Current Test\n";