diff options
| author | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-24 14:51:36 +0000 |
|---|---|---|
| committer | michel_j <michel_j@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-05-24 14:51:36 +0000 |
| commit | 812e691ee29a8df2c3c497a43929fe6eb647db7d (patch) | |
| tree | 0f688e93b09107094ab3a6db7358dc1eec58c475 | |
| parent | b16b52f14687b219c1017f59d15c71d2fe62e2f3 (diff) | |
| download | ATCD-812e691ee29a8df2c3c497a43929fe6eb647db7d.tar.gz | |
ChangeLogTag: Tue May 24 09:47:52 2005 Justin Michel <michel_j@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 88a0dc1f56c..56f9490c666 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue May 24 09:47:52 2005 Justin Michel <michel_j@ociweb.com> + + * orbsvcs/examples/ImR/Advanced/TestServer.cpp: + + Disable fuzz check, because it can't detect the try/catch + in the calling function. + Tue May 24 09:14:57 2005 Justin Michel <michel_j@ociweb.com> * orbsvcs/examples/ImR/Advanced/TestServer.h: diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp index 1908d473841..d3441e1939e 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp @@ -331,43 +331,34 @@ void TestServer::pause(int milliseconds) } } -// TestServer::pause -// Pause processing by either sleep or timed run-loop -// void TestServer::run() { - // Startup pause(startupPause_); - // Resolve initial references + // FUZZ: disable check_for_missing_rir_env CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); root_ = PortableServer::POA::_narrow(obj.in()); mgr_ = root_->the_POAManager(); - // Register w/ the manager if (registerWithManager() == false) return; cout << "* Server (" << serverID_ << "." << serverInstanceID_ << ") started." << endl; - // Create IOR Table if (useIORTable_ == true) { + // FUZZ: disable check_for_missing_rir_env CORBA::Object_var obj = orb_->resolve_initial_references("IORTable"); iorTable_ = IORTable::Table::_narrow(obj.in()); } - // Build Servant servant_.reset(new Messenger_i(orb_.in(), serverInstanceID_)); - // Buile the POAs and Objs buildObjects(); - // Activate pause(activatePause_); mgr_->activate(); - // Run with a timeout for activity if (useItLoseItSecs_ > 0) { pause(runPause_); @@ -379,7 +370,6 @@ void TestServer::run() && servant_->acknowledgeHit()); } - // Report shutdown if (orb_->orb_core()->has_shutdown() != 0) { cout << "* Server (" << serverID_ << "." |