Commit 6cd5c8b8 authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Moved castor::exception::AcceptConnectionInterrupted to the

cta::exception::AcceptConnectionInterrupted
parent fc4fb91b
......@@ -71,6 +71,7 @@ set (COMMON_LIB_SRC_FILES
exception/NonRetryableError.cpp
exception/RetryableError.cpp
exception/UserError.cpp
exception/AcceptConnectionInterrupted.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
......
......@@ -21,13 +21,13 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "castor/exception/AcceptConnectionInterrupted.hpp"
#include "common/exception/AcceptConnectionInterrupted.hpp"
// -----------------------------------------------------------------------------
// constructor
// -----------------------------------------------------------------------------
castor::exception::AcceptConnectionInterrupted::AcceptConnectionInterrupted(
cta::exception::AcceptConnectionInterrupted::AcceptConnectionInterrupted(
const time_t remainingTime) throw() :
cta::exception::Exception(),
m_remainingTime(remainingTime) {
......@@ -38,7 +38,7 @@ castor::exception::AcceptConnectionInterrupted::AcceptConnectionInterrupted(
// -----------------------------------------------------------------------------
// remainingTime()
// -----------------------------------------------------------------------------
time_t castor::exception::AcceptConnectionInterrupted::remainingTime() const
time_t cta::exception::AcceptConnectionInterrupted::remainingTime() const
throw() {
return m_remainingTime;
}
......@@ -27,7 +27,7 @@
#include <sys/types.h>
namespace castor {
namespace cta {
namespace exception {
/**
......
......@@ -292,7 +292,7 @@ int castor::io::acceptConnection(const int listenSocketFd)
int castor::io::acceptConnection(const int listenSocketFd,
const time_t timeout) throw(
castor::exception::TimeOut,
castor::exception::AcceptConnectionInterrupted,
cta::exception::AcceptConnectionInterrupted,
cta::exception::Exception) {
// Throw an exception if listenSocketFd is invalid
......@@ -329,7 +329,7 @@ int castor::io::acceptConnection(const int listenSocketFd,
if(pollErrno == EINTR) {
const time_t remainingTime = timeout - (time(NULL) - startTime);
castor::exception::AcceptConnectionInterrupted ex(remainingTime);
cta::exception::AcceptConnectionInterrupted ex(remainingTime);
throw ex;
} else {
......
......@@ -24,7 +24,7 @@
#pragma once
#include "castor/exception/AcceptConnectionInterrupted.hpp"
#include "common/exception/AcceptConnectionInterrupted.hpp"
#include "castor/exception/InvalidArgument.hpp"
#include "castor/exception/NoPortInRange.hpp"
#include "castor/exception/TimeOut.hpp"
......@@ -208,7 +208,7 @@ int acceptConnection(
const int listenSockFd,
const time_t timeout)
throw(castor::exception::TimeOut,
castor::exception::AcceptConnectionInterrupted,
cta::exception::AcceptConnectionInterrupted,
cta::exception::Exception);
/**
......
......@@ -40,7 +40,6 @@ set (UTILS_LIB_SRC_FILES
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp
../exception/TimeOut.cpp
../exception/AcceptConnectionInterrupted.cpp
../exception/CommandLineNotParsed.cpp
../exception/OutOfMemory.cpp
../BaseObject.cpp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment