summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-07-04 11:03:27 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-07-04 11:03:27 +0000
commit6e629f89dbca182f349ad2f0cb15e5200c2d3803 (patch)
tree627533ba216d219c4c82025d0a75b4618e9ff91f
parentb9fa7d8d136df645bcf709c65a1e58331de869fc (diff)
downloadATCD-6e629f89dbca182f349ad2f0cb15e5200c2d3803.tar.gz
Mon Jul 4 11:02:28 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/ImplRepo_Service/ImR_Locator_i.h: * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: Fixed Coverity error * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: Fixed mismatched delete as reported by Coverity
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp2
4 files changed, 12 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b52fc5135df..21101e99aed 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jul 4 11:02:28 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+ * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+ Fixed Coverity error
+
+ * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
+ Fixed mismatched delete as reported by Coverity
+
Wed Jun 29 12:44:21 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Advanced/TO-DO:
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index b8204ebca0e..3dea48a1faf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -547,7 +547,7 @@ ImR_Locator_i::activate_server_i (Server_Info& info, bool manual_start)
}
char*
-ImR_Locator_i::activate_perclient_server_i (Server_Info info, bool manual_start)
+ImR_Locator_i::activate_perclient_server_i (const Server_Info& info, bool manual_start)
{
Server_Info_Ptr shared_info = this->repository_.get_server (info.name);
do
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 7d6ecadacb3..78a36adf23d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -98,7 +98,7 @@ private:
char* activate_server_i (Server_Info& info, bool manual_start);
- char* activate_perclient_server_i (Server_Info info, bool manual_start);
+ char* activate_perclient_server_i (const Server_Info& info, bool manual_start);
ImplementationRepository::StartupInfo*
start_server(Server_Info& info, bool manual_start, int& waiting_clients);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index b8727bcd8c5..447b373c6e2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -203,7 +203,7 @@ Notify_Throughput::~Notify_Throughput ()
{
this->orb_->shutdown (0);
- delete payload_;
+ delete[] payload_;
}
int