Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
aef6db64
Commit
aef6db64
authored
6 years ago
by
Parker, Peter
Browse files
Options
Downloads
Patches
Plain Diff
Refs #22608 - Implicit optional conversions to bool are not allowed.
parent
9ad12400
Branches
shorten_commit_message_requirement
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Catalog/src/ONCat.cpp
+2
-2
2 additions, 2 deletions
Framework/Catalog/src/ONCat.cpp
with
2 additions
and
2 deletions
Framework/Catalog/src/ONCat.cpp
+
2
−
2
View file @
aef6db64
...
@@ -171,7 +171,7 @@ bool ONCat::isUserLoggedIn() const {
...
@@ -171,7 +171,7 @@ bool ONCat::isUserLoggedIn() const {
return
false
;
return
false
;
}
}
return
m_tokenStore
->
getToken
();
return
m_tokenStore
->
getToken
()
.
is_initialized
()
;
}
}
void
ONCat
::
logout
()
{
void
ONCat
::
logout
()
{
...
@@ -342,7 +342,7 @@ void ONCat::refreshTokenIfNeeded(const DateAndTime ¤tTime) {
...
@@ -342,7 +342,7 @@ void ONCat::refreshTokenIfNeeded(const DateAndTime ¤tTime) {
throw
CatalogError
(
ie
.
what
());
throw
CatalogError
(
ie
.
what
());
}
}
}
else
if
(
m_flow
==
OAuthFlow
::
RESOURCE_OWNER_CREDENTIALS
)
{
}
else
if
(
m_flow
==
OAuthFlow
::
RESOURCE_OWNER_CREDENTIALS
)
{
if
(
!
currentToken
)
{
if
(
!
currentToken
.
is_initialized
()
)
{
return
;
return
;
}
}
if
(
!
currentToken
->
isExpired
(
currentTime
))
{
if
(
!
currentToken
->
isExpired
(
currentTime
))
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment