Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
adf43e0d
Commit
adf43e0d
authored
Aug 29, 2016
by
Victor Kotlyar
Browse files
Replaced castor::excetpion::BadAlloc with
cta::exception::BadAlloc
parent
89811c03
Changes
6
Hide whitespace changes
Inline
Side-by-side
common/CMakeLists.txt
View file @
adf43e0d
...
...
@@ -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
...
...
tapeserver/castor
/exception/BadAlloc.cpp
→
common
/exception/BadAlloc.cpp
View file @
adf43e0d
...
...
@@ -21,12 +21,12 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"c
astor
/exception/BadAlloc.hpp"
#include
"c
ommon
/exception/BadAlloc.hpp"
// -----------------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------------
ca
stor
::
exception
::
BadAlloc
::
BadAlloc
()
:
c
t
a
::
exception
::
BadAlloc
::
BadAlloc
()
:
cta
::
exception
::
Exception
()
{
}
tapeserver/castor
/exception/BadAlloc.hpp
→
common
/exception/BadAlloc.hpp
View file @
adf43e0d
...
...
@@ -25,7 +25,7 @@
#include
"common/exception/Exception.hpp"
namespace
ca
stor
{
namespace
exception
{
namespace
c
t
a
{
namespace
exception
{
/**
* BadAlloc.
...
...
@@ -41,5 +41,5 @@ namespace castor { namespace exception {
};
// class BadAlloc
}
}
// namespace ca
stor
exception
}
}
// namespace c
t
a exception
tapeserver/castor/tape/reactor/PollReactorImpl.cpp
View file @
adf43e0d
...
...
@@ -19,7 +19,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"c
astor
/exception/BadAlloc.hpp"
#include
"c
ommon
/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
)
{
ca
stor
::
exception
::
BadAlloc
ex
;
c
t
a
::
exception
::
BadAlloc
ex
;
ex
.
getMessage
()
<<
"Failed to allocate memory for the file-descriptors of poll()"
": "
<<
ba
.
what
();
...
...
tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.cpp
View file @
adf43e0d
...
...
@@ -23,7 +23,7 @@
#include
"castor/common/CastorConfiguration.hpp"
#include
"castor/exception/Errnum.hpp"
#include
"c
astor
/exception/BadAlloc.hpp"
#include
"c
ommon
/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
)
{
ca
stor
::
exception
::
BadAlloc
ex
;
c
t
a
::
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
)
{
ca
stor
::
exception
::
BadAlloc
ex
;
c
t
a
::
exception
::
BadAlloc
ex
;
ex
.
getMessage
()
<<
"Failed to create event handler for communicating with forked sessions"
": "
<<
ba
.
what
();
...
...
tapeserver/castor/utils/CMakeLists.txt
View file @
adf43e0d
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment