Branch: Tag:

2001-06-28

2001-06-28 20:09:18 by Martin Stjernholm <mast@lysator.liu.se>

Fixed so that my_configuration() and module_identifier() always works,
even before create() in the module object is called.

Rev: server/base_server/configuration.pike:1.443
Rev: server/base_server/module.pike:1.115
Rev: server/base_server/roxen.pike:1.680

3:   //   // A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.442 2001/06/26 09:41:06 per Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.443 2001/06/28 20:09:18 mast Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
2453:    mixed err;    int module_type;    +  roxen->module_init_info->set (({this_object(), modname}));       if( datacache ) datacache->flush();   
2464:       if( !moduleinfo )    { -  moduleinfo = roxen.find_module( modname ); +  moduleinfo = roxen->find_module( modname );       if (!moduleinfo)    {    report_warning("Failed to load %s. The module probably "    "doesn't exist in the module path.\n", modname);    got_no_delayed_load = -1; -  +  roxen->module_init_info->set (0);    return 0;    }    }
2506:    }   #endif    got_no_delayed_load = -1; +  roxen->module_init_info->set (0);    return module[id];    }    }
2536:    "called in random order"),    ({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));    }) { +  roxen->module_init_info->set (0);    throw(err);    }    }
2670:    if( me->no_delayed_load && got_no_delayed_load >= 0 )    got_no_delayed_load = 1;    +  roxen->module_init_info->set (0);    return me;   }