Merge branch 'develop' of https://github.com/pocoproject/poco into develop

Data/include/Poco/Data/Binding.h

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

Data/src/Row.cpp

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

Foundation/include/Poco/ScopedUnlock.h

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

Foundation/src/SortedDirectoryIterator.cpp

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

Foundation/src/SplitterChannel.cpp

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

MongoDB/src/Cursor.cpp

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

Net/src/FTPClientSession.cpp

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

NetSSL_OpenSSL/src/SecureSocketImpl.cpp

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