summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Codeset/Codeset_Descriptor.cpp2
-rw-r--r--TAO/tao/default_resource.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp
index 239428d0bb3..1ac130ef943 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -44,7 +44,7 @@ TAO_Codeset_Descriptor::~TAO_Codeset_Descriptor ()
temp = trans_base_->next_;
// don't need to delete the associated translator factory, it is
// owned by the service registry
- delete [] trans_base_->name_;
+ ACE_OS::free (trans_base_->name_);
delete trans_base_;
trans_base_ = temp;
}
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 285df342808..de23d785871 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -74,6 +74,9 @@ TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
CORBA::string_free (this->parser_names_[i]);
delete [] this->parser_names_;
+
+ delete codeset_manager_;
+ codeset_manager_ = 0;
}
int