summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-27 18:54:39 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-03-27 18:54:39 +0000
commit0dc06f3d3f302cc5265d97ab2d2330bf563b558c (patch)
treee46251a1e414b391255a5771e0bec173f00a2c4d
parentec103072e1328ff1871e3da62d73c6dd916c75a0 (diff)
downloadATCD-0dc06f3d3f302cc5265d97ab2d2330bf563b558c.tar.gz
ChangeLogTag: Tue Mar 27 12:46:46 2001 Irfan Pyarali <irfan@cs.wustl.edu>
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp14
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp14
2 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 7a3d46e79fa..781bbd482bc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -174,7 +174,11 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
AVStreams::MMDevice::_narrow (obj.in ());
// Add this receiver to the receiver map.
- this->receivers_.bind (receiver_name,
+ ACE_CString flowname =
+ this->sender_name_ +
+ "_" +
+ receiver_name;
+ this->receivers_.bind (flowname,
receiver_device);
}
}
@@ -190,10 +194,7 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
// Initialize the QoS
AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
- ACE_CString flowname;
- flowname =
- this->sender_name_ +
- "_" +
+ ACE_CString flowname =
(*iterator).ext_id_;
// Create the forward flow specification to describe the flow.
@@ -364,8 +365,7 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
if (CORBA::is_nil (this->sender_.in ()))
return;
- ACE_CString flowname;
- flowname =
+ ACE_CString flowname =
this->sender_name_ +
"_" +
this->receiver_name_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index 7a3d46e79fa..781bbd482bc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -174,7 +174,11 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
AVStreams::MMDevice::_narrow (obj.in ());
// Add this receiver to the receiver map.
- this->receivers_.bind (receiver_name,
+ ACE_CString flowname =
+ this->sender_name_ +
+ "_" +
+ receiver_name;
+ this->receivers_.bind (flowname,
receiver_device);
}
}
@@ -190,10 +194,7 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
// Initialize the QoS
AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
- ACE_CString flowname;
- flowname =
- this->sender_name_ +
- "_" +
+ ACE_CString flowname =
(*iterator).ext_id_;
// Create the forward flow specification to describe the flow.
@@ -364,8 +365,7 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
if (CORBA::is_nil (this->sender_.in ()))
return;
- ACE_CString flowname;
- flowname =
+ ACE_CString flowname =
this->sender_name_ +
"_" +
this->receiver_name_;