#538 more dtor fixes and some style fixes along the way

This commit is contained in:
Günter Obiltschnig 2014-09-29 12:09:01 +02:00
parent 135c10c0f5
commit a2617235fe
10 changed files with 68 additions and 37 deletions

View File

@ -140,7 +140,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -264,7 +264,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -396,7 +396,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -559,7 +559,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -689,7 +689,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -819,7 +819,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -949,7 +949,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -1079,7 +1079,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -1209,7 +1209,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }
@ -1339,7 +1339,7 @@ public:
} }
~CopyBinding() ~CopyBinding()
/// Destroys the Binding. /// Destroys the CopyBinding.
{ {
} }

View File

@ -86,7 +86,8 @@ Poco::Dynamic::Var& Row::get(std::size_t col)
try try
{ {
return _values.at(col); return _values.at(col);
}catch (std::out_of_range& re) }
catch (std::out_of_range& re)
{ {
throw RangeException(re.what()); throw RangeException(re.what());
} }

View File

@ -40,9 +40,16 @@ public:
_mutex.unlock(); _mutex.unlock();
} }
inline ~ScopedUnlock() inline ~ScopedUnlock()
{
try
{ {
_mutex.lock(); _mutex.lock();
} }
catch (...)
{
poco_unexpected();
}
}
private: private:
M& _mutex; M& _mutex;

View File

@ -62,6 +62,7 @@ SortedDirectoryIterator::~SortedDirectoryIterator()
{ {
} }
SortedDirectoryIterator& SortedDirectoryIterator::operator ++() SortedDirectoryIterator& SortedDirectoryIterator::operator ++()
{ {
if (!_is_finished) if (!_is_finished)

View File

@ -28,9 +28,16 @@ SplitterChannel::SplitterChannel()
SplitterChannel::~SplitterChannel() SplitterChannel::~SplitterChannel()
{
try
{ {
close(); close();
} }
catch (...)
{
poco_unexpected();
}
}
void SplitterChannel::addChannel(Channel* pChannel) void SplitterChannel::addChannel(Channel* pChannel)

View File

@ -38,8 +38,15 @@ Cursor::Cursor(const std::string& fullCollectionName, QueryRequest::Flags flags)
Cursor::~Cursor() Cursor::~Cursor()
{
try
{ {
poco_assert_dbg(!_response.cursorID()); poco_assert_dbg(!_response.cursorID());
}
catch (...)
{
}
} }

View File

@ -84,8 +84,13 @@ FTPClientSession::FTPClientSession(const std::string& host,
FTPClientSession::~FTPClientSession() FTPClientSession::~FTPClientSession()
{ {
try { close(); } try
catch (...) { } {
close();
}
catch (...)
{
}
} }
@ -126,7 +131,9 @@ void FTPClientSession::open(const std::string& host,
_host = host; _host = host;
_port = port; _port = port;
if (!username.empty()) if (!username.empty())
{
login(username, password); login(username, password);
}
else else
{ {
_pControlSocket = new DialogSocket(SocketAddress(_host, _port)); _pControlSocket = new DialogSocket(SocketAddress(_host, _port));

View File

@ -66,6 +66,7 @@ SecureSocketImpl::~SecureSocketImpl()
} }
catch (...) catch (...)
{ {
poco_unexpected();
} }
} }