summaryrefslogtreecommitdiff
path: root/TAO/tests/NestedUpcall
diff options
context:
space:
mode:
authordoccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-11-09 18:57:00 +0000
committerdoccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-11-09 18:57:00 +0000
commitbad29e5ef3f5e947a226e754e7fc53243230bb6a (patch)
treeb28cba70f3750392db7167a24fc90ea268e2c706 /TAO/tests/NestedUpcall
parent3db71840bc9c446a7709b1a8f620bee6a953e6d3 (diff)
downloadATCD-bad29e5ef3f5e947a226e754e7fc53243230bb6a.tar.gz
ChangeLogTag: Thu Nov 9 10:38:19 2000 Priyanka Gontla <pgontla@ece.uci.edu>
Diffstat (limited to 'TAO/tests/NestedUpcall')
-rw-r--r--TAO/tests/NestedUpcall/Simple/Makefile2
-rw-r--r--TAO/tests/NestedUpcall/Simple/client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/server_i.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/simple-client.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Simple/svc.conf2
5 files changed, 9 insertions, 1 deletions
diff --git a/TAO/tests/NestedUpcall/Simple/Makefile b/TAO/tests/NestedUpcall/Simple/Makefile
index 065750f243a..dc0aa4af1b6 100644
--- a/TAO/tests/NestedUpcall/Simple/Makefile
+++ b/TAO/tests/NestedUpcall/Simple/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif # ! TAO_ROOT
-LDLIBS = -lTAO
+LDLIBS = -lTAO_Strategies -lTAO
IDL_FILES = test
IDL_SRC = testC.cpp testS.cpp
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 3330c44b3b0..de19653abd4 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -52,6 +52,8 @@ Client_Task::svc (void)
call_count,
ACE_TRY_ENV);
ACE_TRY_CHECK;
+
+ return 0;
}
ACE_CATCHANY
{
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index e0b0b963208..31888a61dc8 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -19,6 +19,8 @@ server_i::start (client_ptr c,
this->ping (time_to_live,
ACE_TRY_ENV);
ACE_CHECK;
+
+ return;
}
void
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 8cfa5b34760..9bd050ba49c 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -55,6 +55,8 @@ Client_Task::svc (void)
call_count,
ACE_TRY_ENV);
ACE_TRY_CHECK;
+
+ return 0;
}
ACE_CATCHANY
{
diff --git a/TAO/tests/NestedUpcall/Simple/svc.conf b/TAO/tests/NestedUpcall/Simple/svc.conf
index 659a3204439..97c7c4bae76 100644
--- a/TAO/tests/NestedUpcall/Simple/svc.conf
+++ b/TAO/tests/NestedUpcall/Simple/svc.conf
@@ -1,5 +1,7 @@
# $Id$
#
+dynamic Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st"
+
# static Resource_Factory "-ORBReactorType tp"
# static Server_Strategy_Factory "-ORBConcurrency thread-per-connection"