OpenJDK / jdk8u / jdk8u / jdk
changeset 9912:41903ff88ae8
8051614: smartcardio TCK tests fail due to lack of 'reset' permission
Reviewed-by: valeriep
| author | coffeys |
|---|---|
| date | Wed, 23 Jul 2014 20:14:02 +0100 |
| parents | b1725c165e29 |
| children | dfb9f24d56b5 6c7c3a54777f |
| files | src/share/classes/sun/security/smartcardio/CardImpl.java |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/security/smartcardio/CardImpl.java Mon Jul 21 21:46:56 2014 +0000 +++ b/src/share/classes/sun/security/smartcardio/CardImpl.java Wed Jul 23 20:14:02 2014 +0100 @@ -244,9 +244,6 @@ "sun.security.smartcardio.invertCardReset", "false"))); public void disconnect(boolean reset) throws CardException { - if (invertReset) { - reset = !reset; - } if (reset) { checkSecurity("reset"); } @@ -254,6 +251,10 @@ return; } checkExclusive(); + // to preserve old behaviour, don't change flag until here + if (invertReset) { + reset = !reset; + } try { SCardDisconnect(cardId, (reset ? SCARD_RESET_CARD : SCARD_LEAVE_CARD)); } catch (PCSCException e) {