diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-12-17 13:35:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-12-17 13:35:12 +0000 |
| commit | caa112198d394d6482624329939526e306783599 (patch) | |
| tree | 1eb07421365feb8c7d12a2b1881082f84aa42ee4 | |
| parent | 6971f532f15e1efd3ca05379638ad9d9b8c76f50 (diff) | |
| download | ATCD-caa112198d394d6482624329939526e306783599.tar.gz | |
Tue Dec 17 13:36:01 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Containers/Container_Base_T.cpp:
RETAIN is the default servant retention policy, so no need
to explicitly set it
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/ciao/Containers/Container_Base_T.cpp | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 9715a697b70..141343bad2e 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 17 13:36:01 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/Containers/Container_Base_T.cpp: + RETAIN is the default servant retention policy, so no need + to explicitly set it + Sun Dec 8 18:30:24 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Bug_3769_Regression/Foo.idl: diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp index fc2ead9808d..95fd3ce6d4e 100644 --- a/CIAO/ciao/Containers/Container_Base_T.cpp +++ b/CIAO/ciao/Containers/Container_Base_T.cpp @@ -878,14 +878,11 @@ namespace CIAO PortableServer::POAManager_var poa_manager = root->the_POAManager (); - TAO::Utils::PolicyList_Destroyer policies (2); - policies.length (2); + TAO::Utils::PolicyList_Destroyer policies (1); + policies.length (1); policies[0] = root->create_id_assignment_policy (PortableServer::USER_ID); - // Servant Retention Policy - policies[1] = - root->create_servant_retention_policy (PortableServer::RETAIN); this->facet_cons_poa_ = root->create_POA (name, |