diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2006-06-13 13:54:15 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2006-06-13 13:54:15 +0000 |
| commit | fe4b27bda50afb8d909ca1238ee1d245e4604396 (patch) | |
| tree | adaff328d12097d8a3fb379d12c99a3b43757c7e | |
| parent | fcb1973bacabb46c6217eb2c1ed53b39ecd7fab3 (diff) | |
| download | ATCD-fe4b27bda50afb8d909ca1238ee1d245e4604396.tar.gz | |
Tue Jun 13 13:51:11 UTC 2006 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 25 | ||||
| -rw-r--r-- | TAO/tests/Bug_2494_Regression/client.cpp | 3 |
2 files changed, 19 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3df49838e64..6c073b25a2b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Jun 13 13:51:11 UTC 2006 Adam Mitz <mitza@ociweb.com> + + * tests/Bug_2494_Regression/client.cpp: + + The scoreboard was marking this test as "failed" because it printed + "EXCEPTION" (from the client process). This isn't a failure as long + as the server process still exits cleanly. The test is now modified + so that it doesn't print "EXCEPTION". + Sun Jun 11 16:46:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/EventLog_i.cpp: @@ -10,14 +19,14 @@ Sun Jun 11 16:46:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> Sun Jun 11 00:54:57 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> - * orbsvcs/orbsvcs/Log/BasicLog_i.cpp: - * orbsvcs/orbsvcs/Log/BasicLog_i.h: - * orbsvcs/orbsvcs/Log/EventLog_i.cpp: - * orbsvcs/orbsvcs/Log/EventLog_i.h: - * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp: - * orbsvcs/orbsvcs/Log/NotifyLog_i.h: - * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp: - * orbsvcs/orbsvcs/Log/RTEventLog_i.h: + * orbsvcs/orbsvcs/Log/BasicLog_i.cpp: + * orbsvcs/orbsvcs/Log/BasicLog_i.h: + * orbsvcs/orbsvcs/Log/EventLog_i.cpp: + * orbsvcs/orbsvcs/Log/EventLog_i.h: + * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp: + * orbsvcs/orbsvcs/Log/NotifyLog_i.h: + * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp: + * orbsvcs/orbsvcs/Log/RTEventLog_i.h: Remove member variable logmgr_i_, as it's also a protected member in the base class. diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp index 3ec481e7167..cb68345bc48 100644 --- a/TAO/tests/Bug_2494_Regression/client.cpp +++ b/TAO/tests/Bug_2494_Regression/client.cpp @@ -129,7 +129,8 @@ main (int argc, char *argv[]) } catch (CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "Exception caught:"); + ACE_DEBUG ((LM_ERROR, ACE_TEXT ("(%P|%t) Exception caught: \n%s\n"), + ACE_TEXT_CHAR_TO_TCHAR (ex._info ().c_str ()))); return 1; } |