[omniORB] Change in src/lib/omniORB/orbcore/corbaORB.cc ORB_init

[Paul Keeley]

In version 4.0 of omniORB ORB_init had the following section of code to set
the config file.

#if !defined(NTArchitecture)
    const char* config_fname = CONFIG_DEFAULT_LOCATION;
#else
    const char* config_fname = 0;
#endif
    {
      const char* f = getenv(CONFIG_ENV);
      if (f) config_fname = f;
    }
    if (config_fname) {
      orbOptions::singleton().importFromFile(config_fname);
    }
#if defined(NTArchitecture) && !defined(__ETS_KERNEL__)
    else {
      // Parse configuration from registry on NT if no configuration
      // file is specified.
      orbOptions::singleton().importFromRegistry();
    }
#endif

In version 4.0.2 there is no conditional setting of the config_fname -
CONFIG_DEFAULT_LOCATION is always used.  The CONFIG_DEFAULT_LOCATION is also
defined in the make file if it is not there.  This in effect means that the
registry is never read because the config filename is defined.  My questions
are:  1- Is this an intentional change?  And 2, would it be better to define
CONFIG_DEFAULT_LOCATION as 0 or to re-add the #IF logic.

Cheers,

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Paul Keeley
IDS Developer, INSCI                                   Tel: 508-870-4324
Two Westborough Business Park                   Fax: 508-870-5585
Suite 2000/2001                                            
Westborough MA 01581                               mailto: pkeeley at insci.com
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~