An Overlay-based
Virtual Network Substrate
SpoVNet

Changeset 5870 for source/ariba/utility


Ignore:
Timestamp:
Aug 11, 2009, 4:11:02 PM (15 years ago)
Author:
Christoph Mayer
Message:

merge noch nicht fertig

Location:
source/ariba/utility
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/utility/addressing

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/bluetoothsdp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/periodicbroadcast

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/messages/Message.cpp

    r3690 r5870  
    5252
    5353Message::~Message() {
     54        dropPayload();
    5455//      if ( srcAddr != NULL) delete srcAddr;
    5556//      if ( destAddr != NULL) delete destAddr;
  • source/ariba/utility/serialization/Data.hpp

    r3690 r5870  
    420420
    421421        finline void release() {
    422                 delete [] bufferPtr;
     422                if (bufferPtr!=NULL && bufferLen>=0) delete [] bufferPtr;
    423423                bufferPtr = NULL;
    424424                bufferLen = -1;
  • source/ariba/utility/system/StartupWrapper.cpp

    r5737 r5870  
    119119                        log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BootstrapManager"));
    120120                        logger->setLevel(log4cxx::Level::getDebug());
    121         }
     121        }*/
    122122        {
    123123                        log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("Chord"));
    124                         logger->setLevel(log4cxx::Level::getDebug());
     124                        logger->setLevel(log4cxx::Level::getInfo());
    125125        }
    126126        {
    127127                        log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseOverlay"));
    128                         logger->setLevel(log4cxx::Level::getDebug());
    129         }*/
     128                        logger->setLevel(log4cxx::Level::getInfo());
     129        }
    130130
    131131        //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
  • source/ariba/utility/transport

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.