summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf2
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf2
-rw-r--r--TAO/tests/Collocation/svc.conf2
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/svc.conf2
6 files changed, 6 insertions, 6 deletions
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 7cc598720fb..9206455908e 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -2,6 +2,6 @@
#
# Please see $TAO_ROOT/docs/Options.html for details on these options.
#
-static Resource_Factory "-ORBReactorType select_st -ORBConnectorLock null"
+static Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null"
static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 26058995fd3..10aa44c96da 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -5,6 +5,6 @@
static Advanced_Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null "
static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Resource_Factory "-ORBConnectorLock null"
+static Resource_Factory "-ORBConnectionCacheLock null"
static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
index ae78c85c972..abc9ba23e2e 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
@@ -3,5 +3,5 @@
# Please see $TAO_ROOT/docs/Options.html for details on these options.
#
-static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectorLock null"
+static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index fc1943a0dba..861671ff570 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
# Please see $TAO_ROOT/docs/Options.html for details on these options.
#
-static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectorLock null"
+static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/tests/Collocation/svc.conf b/TAO/tests/Collocation/svc.conf
index cd727548b41..16f01bef61e 100644
--- a/TAO/tests/Collocation/svc.conf
+++ b/TAO/tests/Collocation/svc.conf
@@ -4,7 +4,7 @@
#
# This is a single threaded "server."
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectorLock null"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
# Make sure we use RW client handler so if something goes wrong, the program will bloc,
# i.e., won't work.
diff --git a/TAO/tests/Smart_Proxies/Collocation/svc.conf b/TAO/tests/Smart_Proxies/Collocation/svc.conf
index cd727548b41..16f01bef61e 100644
--- a/TAO/tests/Smart_Proxies/Collocation/svc.conf
+++ b/TAO/tests/Smart_Proxies/Collocation/svc.conf
@@ -4,7 +4,7 @@
#
# This is a single threaded "server."
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectorLock null"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
# Make sure we use RW client handler so if something goes wrong, the program will bloc,
# i.e., won't work.