diff options
| author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-27 02:46:40 +0000 |
|---|---|---|
| committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-27 02:46:40 +0000 |
| commit | c1d5a59e4abdd8b2691e58a34059842c9abf76c2 (patch) | |
| tree | 5290303a2eb37294b6576e5248dbefc4146a8df6 | |
| parent | 4b6694c5a2baef59a4845caef124ab550a876e43 (diff) | |
| download | ATCD-c1d5a59e4abdd8b2691e58a34059842c9abf76c2.tar.gz | |
ChangeLogTag:Sat Aug 26 21:50:34 2000 Marina Spivak <marina@cs.wustl.edu>
| -rw-r--r-- | TAO/tao/Acceptor_Registry.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 30 |
2 files changed, 22 insertions, 10 deletions
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 9aa05d022c3..1105462ae07 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -57,7 +57,7 @@ TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key, // profiles than there are endpoints. In some cases, there can be // less profiles than endpoints. size_t pfile_count = this->endpoint_count (); - if (mprofile.set (pfile_count) != pfile_count) + if (mprofile.set (pfile_count) < 0) return -1; TAO_AcceptorSetIterator end = this->end (); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 9a9351410e3..f4f97aacb43 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1946,21 +1946,33 @@ TAO_ORB_Core::set_default_policies (void) switch (protocol_type) { case TAO_TAG_IIOP_PROFILE: - ACE_NEW_RETURN (protocols[i].transport_protocol_properties, - TAO_TCP_Properties, - -1); + { + TAO_TCP_Properties *properties; + ACE_NEW_RETURN (properties, + TAO_TCP_Properties, + -1); + protocols[i].transport_protocol_properties = properties; + } break; case TAO_TAG_UIOP_PROFILE: - ACE_NEW_RETURN (protocols[i].transport_protocol_properties, - TAO_Unix_Domain_Properties, - -1); + { + TAO_Unix_Domain_Properties *properties; + ACE_NEW_RETURN (properties, + TAO_Unix_Domain_Properties, + -1); + protocols[i].transport_protocol_properties = properties; + } break; case TAO_TAG_SHMEM_PROFILE: - ACE_NEW_RETURN (protocols[i].transport_protocol_properties, - TAO_SMEM_Properties, - -1); + { + TAO_SMEM_Properties *properties; + ACE_NEW_RETURN (properties, + TAO_SMEM_Properties, + -1); + protocols[i].transport_protocol_properties = properties; + } break; default: |