diff options
| author | smcqueen <smcqueen@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-08 12:02:27 +0000 |
|---|---|---|
| committer | smcqueen <smcqueen@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-06-08 12:02:27 +0000 |
| commit | effa13cafabbbc1edf16a327ed22c32a38207c5b (patch) | |
| tree | 42e4672e8aaa00540d992b6e2b569bfbf2fa5e7d /TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp | |
| parent | a56da0bdf4a5cebb4368d2f49806ae74bcf518bb (diff) | |
| download | ATCD-effa13cafabbbc1edf16a327ed22c32a38207c5b.tar.gz | |
ChangeLogTag: Tue Jun 08 12:07:55 2004 Simon McQueen <sm@prismtechnologies.com>
Diffstat (limited to 'TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp index c6a696b92ca..a8f02762c14 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp @@ -265,6 +265,14 @@ Options::init (int argc, char *argv[]) // Now initialize the orb and pass it the leftover arguments ACE_TRY_NEW_ENV { + // First make sure the Activator doesn't pick up an environment setting + // that would make it try to register its POAs with the ImplRepo. + char* use_IMR_env_var_value = ACE_OS::getenv ("TAO_USE_IMR"); + if (use_IMR_env_var_value != 0) + { + ACE_OS::putenv ("TAO_USE_IMR=0"); + } + this->orb_ = CORBA::ORB_init (orb_argc, orb_args.argv (), 0 |