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
ecsec Public
reqesidta-prototype
client-signer
Commits
188560a6
Commit
188560a6
authored
Sep 03, 2019
by
Tobias Wich
Browse files
Forward interruption of the PACE Step to the gui thread
parent
36a7e65b
Changes
1
Hide whitespace changes
Inline
Side-by-side
addons/tr03112/src/main/java/org/openecard/sal/protocol/eac/PACEStep.java
View file @
188560a6
...
...
@@ -302,8 +302,8 @@ public class PACEStep implements ProtocolStep<DIDAuthenticate, DIDAuthenticateRe
needsTermination
=
true
;
}
}
// terminate activation thread
if
(
needsTermination
)
{
// terminate activation thread
if it has not been interrupted already
if
(
needsTermination
&&
guiResult
!=
ResultStatus
.
INTERRUPTED
)
{
Thread
actThread
=
(
Thread
)
dynCtx2
.
get
(
TR03112Keys
.
ACTIVATION_THREAD
);
if
(
actThread
!=
null
)
{
LOG
.
debug
(
"Interrupting activation thread."
);
...
...
@@ -399,6 +399,14 @@ public class PACEStep implements ProtocolStep<DIDAuthenticate, DIDAuthenticateRe
LOG
.
error
(
ex
.
getMessage
(),
ex
);
response
.
setResult
(
WSHelper
.
makeResultError
(
ECardConstants
.
Minor
.
App
.
INCORRECT_PARM
,
ex
.
getMessage
()));
dynCtx
.
put
(
EACProtocol
.
AUTHENTICATION_DONE
,
false
);
}
catch
(
InterruptedException
e
)
{
LOG
.
error
(
e
.
getMessage
(),
e
);
response
.
setResult
(
WSHelper
.
makeResultUnknownError
(
e
.
getMessage
()));
dynCtx
.
put
(
EACProtocol
.
AUTHENTICATION_DONE
,
false
);
Thread
guiThread
=
(
Thread
)
dynCtx
.
get
(
TR03112Keys
.
OPEN_USER_CONSENT_THREAD
);
if
(
guiThread
!=
null
)
{
guiThread
.
interrupt
();
}
}
catch
(
Exception
e
)
{
LOG
.
error
(
e
.
getMessage
(),
e
);
response
.
setResult
(
WSHelper
.
makeResultUnknownError
(
e
.
getMessage
()));
...
...
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