generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-19 08:46:41 +01:00
Code Issues Projects Releases Wiki Activity

SplitterChannel::addChannel() should only add a channel once

Browse Source 
SplitterChannel::addChannel() should only add a channel once to the internal vector. This prevents issues where the channel is accidentally added twice but only removed once because removeChannel stops at the first result. (#4270)
This commit is contained in:
Andrew Auclair 2023-11-20 22:17:19 -05:00 committed by GitHub
parent 2e608624c8
commit 39e35c316d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Foundation/src/SplitterChannel.cpp
View File

@ -40,10 +40,15 @@ SplitterChannel::~SplitterChannel()
void SplitterChannel::addChannel(Channel::Ptr pChannel)
{
poco_check_ptr (pChannel);
poco_check_ptr(pChannel);
FastMutex::ScopedLock lock(_mutex);
_channels.push_back(pChannel);
// ensure that the channel is only added once
if (std::find(_channels.begin(), _channels.end(), pChannel) == _channels.end())
{
_channels.push_back(pChannel);
}
}
@ -51,13 +56,11 @@ void SplitterChannel::removeChannel(Channel::Ptr pChannel)
{
FastMutex::ScopedLock lock(_mutex);
for (ChannelVec::iterator it = _channels.begin(); it != _channels.end(); ++it)
const auto it = std::find(_channels.begin(), _channels.end(), pChannel);
if (it != _channels.end())
{
if (*it == pChannel)
{
_channels.erase(it);
break;
}
_channels.erase(it);
}
}

37
Foundation/testsuite/src/ChannelTest.cpp
View File

@ -35,7 +35,7 @@ using Poco::Thread;
using Poco::Runnable;
class SimpleFormatter: public Formatter
class SimpleFormatter : public Formatter
{
public:
void format(const Message& msg, std::string& text)
@ -50,7 +50,7 @@ public:
class LogRunnable : public Runnable
{
public:
LogRunnable(AutoPtr<AsyncChannel> pAsync):
LogRunnable(AutoPtr<AsyncChannel> pAsync) :
_pAsync(pAsync),
_stop(false)
{
@ -73,7 +73,7 @@ private:
};
ChannelTest::ChannelTest(const std::string& name): CppUnit::TestCase(name)
ChannelTest::ChannelTest(const std::string& name) : CppUnit::TestCase(name)
{
}
@ -84,16 +84,34 @@ ChannelTest::~ChannelTest()
void ChannelTest::testSplitter()
{
AutoPtr<TestChannel> pChannel1 = new TestChannel;
AutoPtr<TestChannel> pChannel2 = new TestChannel;
AutoPtr<SplitterChannel> pSplitter = new SplitterChannel;
pSplitter->addChannel(pChannel1);
pSplitter->addChannel(pChannel2);
Message msg;
pSplitter->log(msg);
assertTrue(pChannel1->list().size() == 1);
assertTrue(pChannel2->list().size() == 1);
}
void ChannelTest::testSplitterAddSameChannelTwice()
{
AutoPtr<TestChannel> pChannel = new TestChannel;
AutoPtr<SplitterChannel> pSplitter = new SplitterChannel;
pSplitter->addChannel(pChannel);
pSplitter->addChannel(pChannel);
assertTrue(pSplitter->count() == 1);
Message msg;
pSplitter->log(msg);
assertTrue (pChannel->list().size() == 2);
}
pSplitter->removeChannel(pChannel);
assertTrue(pSplitter->count() == 0);
}
void ChannelTest::testAsync()
{
@ -109,7 +127,7 @@ void ChannelTest::testAsync()
pAsync->close();
lr.stop();
t.join();
assertTrue (pChannel->list().size() >= 2);
assertTrue(pChannel->list().size() >= 2);
}
@ -120,8 +138,8 @@ void ChannelTest::testFormatting()
AutoPtr<FormattingChannel> pFormatterChannel = new FormattingChannel(pFormatter, pChannel);
Message msg("Source", "Text", Message::PRIO_INFORMATION);
pFormatterChannel->log(msg);
assertTrue (pChannel->list().size() == 1);
assertTrue (pChannel->list().begin()->getText() == "Source: Text");
assertTrue(pChannel->list().size() == 1);
assertTrue(pChannel->list().begin()->getText() == "Source: Text");
}
@ -143,7 +161,7 @@ void ChannelTest::testStream()
AutoPtr<FormattingChannel> pFormatterChannel = new FormattingChannel(pFormatter, pChannel);
Message msg("Source", "Text", Message::PRIO_INFORMATION);
pFormatterChannel->log(msg);
assertTrue (str.str().find("Source: Text") == 0);
assertTrue(str.str().find("Source: Text") == 0);
}
@ -162,6 +180,7 @@ CppUnit::Test* ChannelTest::suite()
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ChannelTest");
CppUnit_addTest(pSuite, ChannelTest, testSplitter);
CppUnit_addTest(pSuite, ChannelTest, testSplitterAddSameChannelTwice);
CppUnit_addTest(pSuite, ChannelTest, testAsync);
CppUnit_addTest(pSuite, ChannelTest, testFormatting);
CppUnit_addTest(pSuite, ChannelTest, testConsole);

3
Foundation/testsuite/src/ChannelTest.h
View File

@ -18,13 +18,14 @@
#include "CppUnit/TestCase.h"
class ChannelTest: public CppUnit::TestCase
class ChannelTest : public CppUnit::TestCase
{
public:
ChannelTest(const std::string& name);
~ChannelTest();
void testSplitter();
void testSplitterAddSameChannelTwice();
void testAsync();
void testFormatting();
void testConsole();