summaryrefslogtreecommitdiff
path: root/TAO/tao/Strategies/SHMIOP_Connector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Strategies/SHMIOP_Connector.cpp')
-rw-r--r--TAO/tao/Strategies/SHMIOP_Connector.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index eec5c62dcae..3ea9b90662a 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -91,20 +91,10 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
-1);
- if (this->base_connector_.open (this->orb_core ()->reactor (),
- connect_creation_strategy,
- &this->connect_strategy_,
- concurrency_strategy) == -1)
- return -1;
- // We can take advantage of the multithreaded shared-memory transport
- // if the client will block on read (i.e., will not allow callback.)
- else if (orb_core->client_factory ()->allow_callback () == 0)
-
- {
- this->base_connector_.connector ().preferred_strategy (ACE_MEM_IO::MT);
- this->connect_strategy_.connector ().preferred_strategy (ACE_MEM_IO::MT);
- }
- return 0;
+ return this->base_connector_.open (this->orb_core ()->reactor (),
+ connect_creation_strategy,
+ &this->connect_strategy_,
+ concurrency_strategy);
}
int