summaryrefslogtreecommitdiff
path: root/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Bug_1361_Regression/Server_Thread_Pool.cpp')
-rw-r--r--tests/Bug_1361_Regression/Server_Thread_Pool.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 57cf2b62aa1..083131a18b4 100644
--- a/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -45,7 +45,7 @@ Thread_Pool::shutdown (void)
i + 1));
ACE_Message_Block *mb1;
ACE_NEW_RETURN (mb1,
- ACE_Message_Block ((char*)0),
+ ACE_Message_Block ((char*) Test::Echo::_nil ()),
-1);
mb1->length (0);
@@ -67,7 +67,7 @@ Thread_Pool::put (Test::Echo_ptr echoptr)
{
char * charData = (char *) Test::Echo::_duplicate (echoptr);
- ACE_Message_Block *mb;
+ ACE_Message_Block *mb = 0;
ACE_NEW_RETURN(mb, ACE_Message_Block(charData), -1);
return this->put (mb);
}
@@ -95,7 +95,7 @@ Thread_Pool::svc (void)
for (;; count++)
{
- ACE_Message_Block *mb;
+ ACE_Message_Block *mb = 0;
#if 0
ACE_DEBUG ((LM_DEBUG,
@@ -125,8 +125,7 @@ Thread_Pool::svc (void)
Test::Echo_var echo = (Test::Echo_ptr)mb->base();
- // Echo_var is responsible for deallocating this.
- // mb->release ();
+ mb->release ();
if (CORBA::is_nil(echo.in()))
{