integrated changes from main repository for upcoming 1.2.5 release

This commit is contained in:
Guenter Obiltschnig
2006-10-12 15:08:28 +00:00
parent 41ee6e0ffa
commit 89111b52b3
26 changed files with 283 additions and 171 deletions

View File

@@ -1,7 +1,7 @@
//
// FormattingChannel.cpp
//
// $Id: //poco/1.2/Foundation/src/FormattingChannel.cpp#1 $
// $Id: //poco/1.2/Foundation/src/FormattingChannel.cpp#2 $
//
// Library: Foundation
// Package: Logging
@@ -126,8 +126,8 @@ void FormattingChannel::setProperty(const std::string& name, const std::string&
setChannel(LoggingRegistry::defaultRegistry().channelForName(value));
else if (name == "formatter")
setFormatter(LoggingRegistry::defaultRegistry().formatterForName(value));
else
Channel::setProperty(name, value);
else if (_pChannel)
_pChannel->setProperty(name, value);
}