Changeset 97

Timestamp:

06/04/10 15:59:28 (14 years ago)

Author:

hozdoba

Message:

Plus de fuite mémoire

Location:

XMLIO_V2/dev/dev_rv

Files:

• xmlio_logger.hpp (modified) (4 diffs)
• xmlio_object_template.hpp (modified) (2 diffs)
• xmlio_xml_node.hpp (modified) (1 diff)
• xmlio_xml_parser.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/xmlio_logger.hpp

@@ -10 +10 @@
 #include <Poco/Message.h>
 
+#include <Poco/AutoPtr.h>
+
+
 // Classes utilisées issues de Poco
 using Poco::Logger;
@@ -17 +20 @@
 using Poco::FileChannel;
 using Poco::Message;
+
+using Poco::AutoPtr;
 
 namespace XMLIOSERVER
@@ -29 +34 @@
    
             // TODO Créer une sortie fichier.
-            pf = new PatternFormatter("[%Y-%m-%d %H:%M:%S] %t");
-            cc = new ConsoleChannel();
-            pFCConsole = new FormattingChannel();
+            AutoPtr<PatternFormatter> pf = new PatternFormatter("[%Y-%m-%d %H:%M:%S] %t");
+            AutoPtr<ConsoleChannel> cc = new ConsoleChannel();
+            AutoPtr<FormattingChannel> pFCConsole = new FormattingChannel(pf);
             pFCConsole->setChannel(cc);
             pFCConsole->open();            
@@ -39 +44 @@
          static Logger & GetConsoleLogger(void) {return (Logger::get("ConsoleLogger"));}   
          
-         ~ILogger(void) { delete pf;}   
-         
-      private :
-         FormattingChannel * pFCConsole;
-         PatternFormatter  * pf;
-         ConsoleChannel      * cc;
-      
+         ~ILogger(void) 
+         { /* Ne rien faire de plus */ }   
+               
    }; // class XMLIOLogger
    

XMLIO_V2/dev/dev_rv/xmlio_object_template.hpp

@@ -31 +31 @@
          {
             T* value = new T;
-            ObjectTemplate<T>::AllListObj[CurrContext].addObject(value); //<< Perte mémoire ici
+            ObjectTemplate<T>::AllListObj[CurrContext].addObject(value);
             return (*value);
          }
@@ -38 +38 @@
          { return (*ObjectTemplate<T>::AllListObj[CurrContext][_id]); }
          
-         static bool HasObject(const string _id)
+         static bool HasObject(const string _id)// << Bug
          { return (ObjectTemplate<T>::AllListObj[CurrContext].hasMappedValue(_id)); }
          

XMLIO_V2/dev/dev_rv/xmlio_xml_node.hpp

@@ -137 +137 @@
                AutoPtr<NamedNodeMap> map = this->getCNode()->attributes();
               
-              for(unsigned int i = 0; i< map->length(); i++)
-               attributes[map->item(i)->nodeName()] = map->item(i)->nodeValue();
+               for(unsigned int i = 0; i< map->length(); i++)
+                  attributes[map->item(i)->nodeName()] = map->item(i)->nodeValue();
 
-              return (true);
+               return (true);
             }
             

XMLIO_V2/dev/dev_rv/xmlio_xml_parser.hpp

@@ -55 +55 @@
                ifstream istr( file.c_str() , ifstream::in );
                XMLNode node("simulation");
-               XMLNode::CreateNode(node, istr);
+               XMLNode::CreateNode(node, istr, "simulation");
                XMLParser::Parse(node);
                log << "Nombre de Contexts listés : " << Context::GetCurrentListObject().getSize() << " contre 1 attendus."<< std::endl;