Branch: Tag:

2009-11-03

2009-11-03 10:00:39 by Martin Stjernholm <mast@lysator.liu.se>

Fixed false alarm from a debug check when a module is reloaded.

Rev: server/base_server/configuration.pike:1.684

5:   // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.683 2009/11/01 21:35:55 mast Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.684 2009/11/03 10:00:39 mast Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
3556:    RoxenModule old_module = find_module( modname );    ModuleInfo mi = roxen.find_module( (modname/"#")[0] );    -  roxen->bootstrap_info->set (({this_object(), modname })); -  +     if( !old_module ) return 0;       // Temporarily shift out of the rxml parsing context if we're inside
3581:    RoxenModule nm;       // Load up a new instance. +  roxen->bootstrap_info->set (({this_object(), modname }));    nm = mi->instance( this_object() ); -  +  roxen->bootstrap_info->set (0); +     // If this is a faked module, let's call it a failure.    if( nm->not_a_module )    {