Changeset 5870 for source/ariba/utility

Timestamp:

Aug 11, 2009, 4:11:02 PM (15 years ago)

Author:

Christoph Mayer

Message:

merge noch nicht fertig

Location:

source/ariba/utility

Files:

• addressing (modified) (1 prop)
• bootstrap/modules/bluetoothsdp (modified) (1 prop)
• bootstrap/modules/periodicbroadcast (modified) (1 prop)
• messages/Message.cpp (modified) (1 diff)
• serialization/Data.hpp (modified) (1 diff)
• system/StartupWrapper.cpp (modified) (1 diff)
• transport (modified) (1 prop)

source/ariba/utility/messages/Message.cpp

@@ -52 +52 @@
 
 Message::~Message() {
+        dropPayload();
 //      if ( srcAddr != NULL) delete srcAddr;
 //      if ( destAddr != NULL) delete destAddr;

source/ariba/utility/serialization/Data.hpp

@@ -420 +420 @@
 
         finline void release() {
-                delete [] bufferPtr;
+                if (bufferPtr!=NULL && bufferLen>=0) delete [] bufferPtr;
                 bufferPtr = NULL;
                 bufferLen = -1;

source/ariba/utility/system/StartupWrapper.cpp

@@ -119 +119 @@
                         log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BootstrapManager"));
                         logger->setLevel(log4cxx::Level::getDebug());
-        }
+        }*/
         {
                         log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("Chord"));
-                        logger->setLevel(log4cxx::Level::getDebug());
+                        logger->setLevel(log4cxx::Level::getInfo());
         }
         {
                         log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseOverlay"));
-                        logger->setLevel(log4cxx::Level::getDebug());
-        }*/
+                        logger->setLevel(log4cxx::Level::getInfo());
+        }
 
         //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$