summaryrefslogtreecommitdiff
path: root/TAO/performance-tests/Throughput
diff options
context:
space:
mode:
authormcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-02-11 11:33:12 +0000
committermcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-02-11 11:33:12 +0000
commit4df04cc27ef1e77bcc941afaba7d4c943b98a936 (patch)
tree5054c2bde24d048d4790ff659b61be0838cd0d69 /TAO/performance-tests/Throughput
parentb723802f85ac66026a503827677a2fb1e9a77933 (diff)
downloadATCD-4df04cc27ef1e77bcc941afaba7d4c943b98a936.tar.gz
Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'TAO/performance-tests/Throughput')
-rw-r--r--TAO/performance-tests/Throughput/svc.conf4
-rw-r--r--TAO/performance-tests/Throughput/svc.conf.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/TAO/performance-tests/Throughput/svc.conf b/TAO/performance-tests/Throughput/svc.conf
index 0804ab1486e..d389aa68c95 100644
--- a/TAO/performance-tests/Throughput/svc.conf
+++ b/TAO/performance-tests/Throughput/svc.conf
@@ -4,5 +4,5 @@
#
static Advanced_Resource_Factory "-ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Server_Strategy_Factory "-ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Throughput/svc.conf.xml b/TAO/performance-tests/Throughput/svc.conf.xml
index 32eb197be90..e3cd786d2cc 100644
--- a/TAO/performance-tests/Throughput/svc.conf.xml
+++ b/TAO/performance-tests/Throughput/svc.conf.xml
@@ -6,6 +6,6 @@
<!-- Please see $TAO_ROOT/docs/Options.html for details on these options. -->
<!-- -->
<static id="Advanced_Resource_Factory" params="-ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"/>
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/>
- <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
+ <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
+ <static id="Server_Strategy_Factory" params="-ORBAllowReactivationOfSystemids 0"/>
</ACE_Svc_Conf>