Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Uploader
Commits
85ab4a9a
Commit
85ab4a9a
authored
Feb 07, 2019
by
Matija Obreza
Browse files
Fix: Settings fail to load when refreshToken missing
parent
729f50ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
anno-gui/src/main/java/org/genesys2/anno/gui/DwcaBuilder.java
View file @
85ab4a9a
...
...
@@ -311,7 +311,9 @@ public class DwcaBuilder extends AbstractModelObject {
oAuthSettings
.
setClientKey
(
jsonSettings
.
getString
(
"clientKey"
));
oAuthSettings
.
setClientSecret
(
jsonSettings
.
getString
(
"clientSecret"
));
oAuthSettings
.
setScope
(
StringUtils
.
defaultIfBlank
(
jsonSettings
.
getString
(
"scope"
),
"read,write"
));
oAuthSettings
.
setRefreshToken
(
jsonSettings
.
getString
(
"refreshToken"
));
if
(
jsonSettings
.
has
(
"refreshToken"
))
{
oAuthSettings
.
setRefreshToken
(
jsonSettings
.
getString
(
"refreshToken"
));
}
oAuthSettings
.
setServerUrl
(
jsonSettings
.
getString
(
"serverUrl"
));
oAuthSettings
.
setTokenEndpoint
(
jsonSettings
.
getString
(
"tokenEndpoint"
));
...
...
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
View file @
85ab4a9a
...
...
@@ -501,7 +501,7 @@ public class PushDialog extends Dialog {
}
if
(
futures
.
size
()
>
1
)
{
_log
.
warn
(
"Waiting for uploads still running: "
+
futures
.
size
());
_log
.
debug
(
"Waiting for uploads still running: "
+
futures
.
size
());
}
// We're the last job
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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