[myserver-commit] [3082] The main configuration file is closed after it is parsed.

[Giuseppe Scrivano]

Revision: 3082
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3082
Author:   gscrivano
Date:     2009-05-05 18:30:06 +0000 (Tue, 05 May 2009)
Log Message:
-----------
The main configuration file is closed after it is parsed.

Modified Paths:
--------------
    trunk/myserver/include/server/server.h
    trunk/myserver/src/server/server.cpp

Modified: trunk/myserver/include/server/server.h
===================================================================
--- trunk/myserver/include/server/server.h      2009-05-05 18:29:59 UTC (rev 
3081)
+++ trunk/myserver/include/server/server.h      2009-05-05 18:30:06 UTC (rev 
3082)
@@ -141,7 +141,6 @@
   u_long getBuffersize2();
   u_long getThrottlingRate();
   int waitNewConnection(u_long tid, u_long timeout);
-  XmlParser *getConfiguration(){return &configurationFileManager;}
   ListenThreads *getListenThreads(){return &listenThreads;}
 
   void *getEnvString(){return envString;}
@@ -208,7 +207,6 @@
   u_long gid;
   int currentThreadID;
   ProtocolsManager protocols;
-  XmlParser configurationFileManager;
   XmlParser languageParser;
 
   bool autoRebootEnabled;

Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp        2009-05-05 18:29:59 UTC (rev 
3081)
+++ trunk/myserver/src/server/server.cpp        2009-05-05 18:30:06 UTC (rev 
3082)
@@ -938,8 +938,6 @@
 
   filtersFactory.free();
 
-  configurationFileManager.close();
-
   getPluginsManager()->unLoad(this, &languageParser);
 
   delete connectionsMutex;
@@ -975,6 +973,8 @@
 int Server::initialize ()
 {
   const char *data;
+  XmlParser configurationFileManager;
+
 #ifdef WIN32
   envString = GetEnvironmentStrings ();
 #endif
@@ -1000,6 +1000,9 @@
 
   readHashedData (xmlDocGetRootElement(configurationFileManager.getDoc 
())->xmlChildrenNode);
 
+  configurationFileManager.close();
+
+
   /*
    * Process console colors information.
    */