Commit adf43e0d authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Replaced castor::excetpion::BadAlloc with

cta::exception::BadAlloc
parent 89811c03
......@@ -72,6 +72,7 @@ set (COMMON_LIB_SRC_FILES
exception/RetryableError.cpp
exception/UserError.cpp
exception/AcceptConnectionInterrupted.cpp
exception/BadAlloc.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
......
......@@ -21,12 +21,12 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "castor/exception/BadAlloc.hpp"
#include "common/exception/BadAlloc.hpp"
// -----------------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------------
castor::exception::BadAlloc::BadAlloc():
cta::exception::BadAlloc::BadAlloc():
cta::exception::Exception() {
}
......@@ -25,7 +25,7 @@
#include "common/exception/Exception.hpp"
namespace castor { namespace exception {
namespace cta { namespace exception {
/**
* BadAlloc.
......@@ -41,5 +41,5 @@ namespace castor { namespace exception {
}; // class BadAlloc
} } // namespace castor exception
} } // namespace cta exception
......@@ -19,7 +19,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "castor/exception/BadAlloc.hpp"
#include "common/exception/BadAlloc.hpp"
#include "castor/tape/reactor/PollReactorImpl.hpp"
#include "castor/utils/SmartArrayPtr.hpp"
#include "castor/utils/utils.hpp"
......@@ -125,7 +125,7 @@ struct pollfd *castor::tape::reactor::PollReactorImpl::buildPollFds(
try {
fds.reset(new struct pollfd[nfds]);
} catch(std::bad_alloc &ba) {
castor::exception::BadAlloc ex;
cta::exception::BadAlloc ex;
ex.getMessage() <<
"Failed to allocate memory for the file-descriptors of poll()"
": " << ba.what();
......
......@@ -23,7 +23,7 @@
#include "castor/common/CastorConfiguration.hpp"
#include "castor/exception/Errnum.hpp"
#include "castor/exception/BadAlloc.hpp"
#include "common/exception/BadAlloc.hpp"
#include "castor/io/io.hpp"
#include "castor/legacymsg/CommonMarshal.hpp"
#include "castor/legacymsg/TapeMarshal.hpp"
......@@ -556,7 +556,7 @@ void castor::tape::tapeserver::daemon::TapeDaemon::
handler.reset(new ProcessForkerConnectionHandler(reaperSocket, m_reactor,
m_log, *m_catalogue));
} catch(std::bad_alloc &ba) {
castor::exception::BadAlloc ex;
cta::exception::BadAlloc ex;
ex.getMessage() <<
"Failed to create event handler for communicating with the"
" ProcessForker: " << ba.what();
......@@ -584,7 +584,7 @@ void castor::tape::tapeserver::daemon::TapeDaemon::
handler.reset(new TapeMessageHandler(m_tapeDaemonConfig.internalPort,
m_reactor, m_log, *m_catalogue, m_hostName, m_zmqContext));
} catch(std::bad_alloc &ba) {
castor::exception::BadAlloc ex;
cta::exception::BadAlloc ex;
ex.getMessage() <<
"Failed to create event handler for communicating with forked sessions"
": " << ba.what();
......
......@@ -34,7 +34,6 @@ set (UTILS_LIB_SRC_FILES
../exception/InvalidArgument.cpp
../exception/Errnum.cpp
../exception/NotAnOwner.cpp
../exception/BadAlloc.cpp
../exception/InvalidConfigEntry.cpp
../exception/MissingOperand.cpp
../exception/NoPortInRange.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