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
b228c178
Commit
b228c178
authored
Aug 23, 2016
by
Steven Murray
Browse files
MountCmdMain and DismountCmdMain now call ShutdownProtobufLibrary()
parent
adafff00
Changes
2
Hide whitespace changes
Inline
Side-by-side
tapeserver/castor/mediachanger/DismountCmdMain.cpp
View file @
b228c178
...
...
@@ -64,7 +64,9 @@ int main(const int argc, char *const *const argv) {
std
::
string
errorMessage
;
try
{
return
exceptionThrowingMain
(
argc
,
argv
);
const
int
rc
=
exceptionThrowingMain
(
argc
,
argv
);
google
::
protobuf
::
ShutdownProtobufLibrary
();
return
rc
;
}
catch
(
castor
::
exception
::
Exception
&
ex
)
{
errorMessage
=
ex
.
getMessage
().
str
();
}
catch
(
std
::
exception
&
se
)
{
...
...
@@ -77,6 +79,7 @@ int main(const int argc, char *const *const argv) {
// and errorMessage has been set accordingly
std
::
cerr
<<
"Aborting: "
<<
errorMessage
<<
std
::
endl
;
google
::
protobuf
::
ShutdownProtobufLibrary
();
return
1
;
}
...
...
tapeserver/castor/mediachanger/MountCmdMain.cpp
View file @
b228c178
...
...
@@ -63,7 +63,9 @@ int main(const int argc, char *const *const argv) {
std
::
string
errorMessage
;
try
{
return
exceptionThrowingMain
(
argc
,
argv
);
const
int
rc
=
exceptionThrowingMain
(
argc
,
argv
);
google
::
protobuf
::
ShutdownProtobufLibrary
();
return
rc
;
}
catch
(
castor
::
exception
::
Exception
&
ex
)
{
errorMessage
=
ex
.
getMessage
().
str
();
}
catch
(
std
::
exception
&
se
)
{
...
...
@@ -76,6 +78,7 @@ int main(const int argc, char *const *const argv) {
// and errorMessage has been set accordingly
std
::
cerr
<<
"Aborting: "
<<
errorMessage
<<
std
::
endl
;
google
::
protobuf
::
ShutdownProtobufLibrary
();
return
1
;
}
...
...
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