summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-03-09 13:47:50 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-03-09 13:47:50 +0000
commit86dcdacebe2f69396204616a59435a1fec801853 (patch)
treeb0417ffef1d800fa493a9f6fe5855fa0385f7eb3 /TAO
parent7cb4c4f3e172e4565e6f1a62c40001dc444d8af1 (diff)
downloadATCD-86dcdacebe2f69396204616a59435a1fec801853.tar.gz
Fri Mar 9 13:47:52 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/DiffServ/client.cpp6
-rw-r--r--TAO/tests/DiffServ/server.cpp13
3 files changed, 16 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6435bd302b6..aa8491e857d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 9 13:47:52 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/DiffServ/client.cpp:
+ * tests/DiffServ/server.cpp:
+ Added missing duplicate calls
+
Fri Mar 9 11:03:52 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Adapter_Registry.cpp:
diff --git a/TAO/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp
index 5255e9c068f..cd368bc1d9b 100644
--- a/TAO/tests/DiffServ/client.cpp
+++ b/TAO/tests/DiffServ/client.cpp
@@ -137,11 +137,13 @@ main (int argc, char *argv[])
nw_priority->network_priority_model (
TAO::CLIENT_PROPAGATED_NETWORK_PRIORITY);
- policy_list[0] = nw_priority.in ();
+ policy_list[0] = TAO::NetworkPriorityPolicy::_duplicate (nw_priority.in ());
CORBA::Object_var over_ridden_object = server->_set_policy_overrides (
policy_list, CORBA::SET_OVERRIDE);
+ policy_list[0]->destroy ();
+
server = Test::_narrow (over_ridden_object.in ());
// Make several invocation,
@@ -152,7 +154,7 @@ main (int argc, char *argv[])
server->shutdown ();
}
- catch (const CORBA::Exception& ex)
+ catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Caught exception:");
return -1;
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index 3cfe5b2d085..050cf78c51e 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -154,22 +154,21 @@ main (int argc, char *argv[])
TAO::NetworkPriorityPolicy_var nw_priority =
TAO::NetworkPriorityPolicy::_narrow (npp.in ());
- nw_priority->network_priority_model (
- npm);
+ nw_priority->network_priority_model (npm);
- nw_priority->request_diffserv_codepoint (
- request_dscp);
+ nw_priority->request_diffserv_codepoint (request_dscp);
- nw_priority->reply_diffserv_codepoint (
- reply_dscp);
+ nw_priority->reply_diffserv_codepoint (reply_dscp);
- policy_list[0] = nw_priority.in ();
+ policy_list[0] = TAO::NetworkPriorityPolicy::_duplicate (nw_priority.in ());
PortableServer::POA_var child_poa =
root_poa->create_POA ("Child_POA",
poa_manager.in (),
policy_list);
+ policy_list[0]->destroy ();
+
// Servant.
Test_i servant (orb.in ());