summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-03-18 19:19:55 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-03-18 19:19:55 +0000
commitdb7d25c7f469f6266aa549ed7955fc73800e63c8 (patch)
tree36b18864c81b0f0170559da9e2c26d035574690a
parent03d343d8bf9a5db9922870804a18a2e28ffce194 (diff)
downloadATCD-db7d25c7f469f6266aa549ed7955fc73800e63c8.tar.gz
*** empty log message ***
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
index 11a033285a1..deb950dc611 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
@@ -479,8 +479,7 @@ NS_NamingContext::list (CORBA::ULong how_many,
n = context_.current_size ();
}
- // use hash iterator to populate a BindingList with
- // bindings.
+ // Use hash iterator to populate a BindingList with bindings.
CosNaming::BindingList bindings;
bindings.length (n);
NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
@@ -498,8 +497,9 @@ NS_NamingContext::list (CORBA::ULong how_many,
bindings[i].binding_name[0].kind =
CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
}
- // Marina, please add check for memory failure.
- bl = new CosNaming::BindingList (bindings);
+
+ // @@ Marina, please add check for memory failure.
+ ACE_NEW (bl, CosNaming::BindingList (bindings));
// If did not allocate BindingIterator, deallocate hash map
// iterator.
@@ -592,8 +592,8 @@ NS_BindingIterator::next_n (CORBA::ULong how_many,
}
}
- bl = new CosNaming::BindingList (bindings);
// Marina, please check for failed memory allocation.
+ ACE_NEW (bl, CosNaming::BindingList (bindings));
return 1;
}
}