generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 08:31:43 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

39
Net/src/FTPClientSession.cpp
View File

@@ -64,28 +64,33 @@ FTPClientSession::FTPClientSession(const std::string& host,
Poco::UInt16 port,
const std::string& username,
const std::string& password):
_host(host),
_port(port),
_pControlSocket(new DialogSocket(SocketAddress(host, port))),
_pDataStream(0),
_passiveMode(true),
_fileType(TYPE_BINARY),
_supports1738(true),
_serverReady(false),
_isLoggedIn(false),
_timeout(DEFAULT_TIMEOUT)
{
_host(host),
_port(port),
_pControlSocket(new DialogSocket(SocketAddress(host, port))),
_pDataStream(0),
_passiveMode(true),
_fileType(TYPE_BINARY),
_supports1738(true),
_serverReady(false),
_isLoggedIn(false),
_timeout(DEFAULT_TIMEOUT)
{
if (!username.empty())
login(username, password);
else
_pControlSocket->setReceiveTimeout(_timeout);
}
}
FTPClientSession::~FTPClientSession()
{
try
{
try { close(); }
catch (...) { }
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));
@@ -168,12 +175,12 @@ void FTPClientSession::login(const std::string& username, const std::string& pas
void FTPClientSession::logout()
{
{
if (!isOpen())
throw FTPException("Connection is closed.");
if (_isLoggedIn)
{
{
try { endTransfer(); }
catch (...) { }
std::string response;