diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-09 18:23:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 18:23:41 +0200 |
| commit | 4db73f60569d5b3a1a2ed8f7ab119d1c2e770bdb (patch) | |
| tree | 40ec8880486a7895b773bedcd9ce9daedd77529d /TAO | |
| parent | 263e4488a7d0618dcbab2e4f5e7995428cde53ca (diff) | |
| parent | 3b5890cbf46ab51d05e89278524dd199a06a0cfe (diff) | |
| download | ATCD-4db73f60569d5b3a1a2ed8f7ab119d1c2e770bdb.tar.gz | |
Merge pull request #1596 from jwillemsen/jwi-logreplystatus
Log reply status in case of an error and some DII_Deferred_Transient test changes
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/tao/DynamicInterface/Request.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/DII_Deferred_Transient/Hello.h | 4 | ||||
| -rwxr-xr-x | TAO/tests/DII_Deferred_Transient/run_test.pl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 359589118cf..71e69be6eb1 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -381,7 +381,7 @@ CORBA::Request::handle_response (TAO_InputCDR &incoming, default: // @@ (JP) Don't know what to do about any of these yet. TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Request::handle_response, unhandled reply status\n"))); + ACE_TEXT ("TAO (%P|%t) - Request::handle_response, unhandled reply status %d\n"), reply_status)); } } diff --git a/TAO/tests/DII_Deferred_Transient/Hello.h b/TAO/tests/DII_Deferred_Transient/Hello.h index 1f26f2bfe55..107adfda369 100644 --- a/TAO/tests/DII_Deferred_Transient/Hello.h +++ b/TAO/tests/DII_Deferred_Transient/Hello.h @@ -14,9 +14,9 @@ public: Hello (); // = The skeleton methods - virtual void crash (); + void crash () override; - virtual char * get_string (); + char * get_string () override; }; #include /**/ "ace/post.h" diff --git a/TAO/tests/DII_Deferred_Transient/run_test.pl b/TAO/tests/DII_Deferred_Transient/run_test.pl index 80bc1ae58b1..0937403bd21 100755 --- a/TAO/tests/DII_Deferred_Transient/run_test.pl +++ b/TAO/tests/DII_Deferred_Transient/run_test.pl @@ -25,8 +25,8 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); -$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile"); +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -ORBVerboseLogging 1 -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -ORBVerboseLogging 1 -k file://$client_iorfile"); $server_status = $SV->Spawn (); if ($server_status != 0) { |