Merged version 94552 from main trunk into this branchalt_mapping_SAIC

2 files changed, 9 insertions, 0 deletions

diff --git a/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl b/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
index 3c8b6d058ce..67e95fc1752 100755
--- a/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
+++ b/DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl
@@ -39,6 +39,12 @@ $client4->DeleteFile($iorbase);
 
 my $hostname = $server->HostName ();
 
+# Copy configuration file first
+if ($server->PutFile ($svcbase) == -1) {
+    print STDERR "ERROR: cannot set file <$server_svcfile>\n";
+    exit 1;
+}
+
 $SV = $server->CreateProcess ("MessengerServer",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBSvcConf $server_svcfile " .
diff --git a/DevGuideExamples/ValueTypes/Bank/client.cpp b/DevGuideExamples/ValueTypes/Bank/client.cpp
index 9004be236a5..b4f91848e8b 100644
--- a/DevGuideExamples/ValueTypes/Bank/client.cpp
+++ b/DevGuideExamples/ValueTypes/Bank/client.cpp
@@ -92,6 +92,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
     std::cerr << e << std::endl;
     return 1;
   }
+  catch (const std::runtime_error &e) {
+    std::cerr << e.what() << std::endl;
+  }
 
   return 0;
 }