diff options
| author | coffeys <none@none> | 2014-07-25 14:14:59 +0100 |
|---|---|---|
| committer | coffeys <none@none> | 2014-07-25 14:14:59 +0100 |
| commit | 4adc94e46ca20abf8682ed8cee98654aa627e127 (patch) | |
| tree | fbe753840140106d20acc1e69ab226c5e08c957b | |
| parent | 1a03becf639a43699dc328874e9599a9a163292d (diff) | |
| parent | c86e2c8594590387ae5ae16dac0a2a225546b5be (diff) | |
Merge
| -rw-r--r-- | THIRD_PARTY_README | 16 | ||||
| -rw-r--r-- | src/share/classes/sun/security/smartcardio/CardImpl.java | 7 |
2 files changed, 12 insertions, 11 deletions
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index e16cd2ab6..6d1c60f23 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -2,7 +2,7 @@ DO NOT TRANSLATE OR LOCALIZE. ----------------------------- %% This notice is provided with respect to ASM Bytecode Manipulation -Framework v5.0, which may be included with JRE 8, and JDK 8, and +Framework v5.0.3, which may be included with JRE 8, and JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -3349,14 +3349,14 @@ info@urwpp.de or design@bigelowandholmes.com ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.5, which may be included +%% This notice is provided with respect to zlib v1.2.8, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.5, July 18th, 2005 + version 1.2.8, April 28th, 2013 - Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -3382,11 +3382,11 @@ with JRE 8, JDK 8, and OpenJDK 8. ------------------------------------------------------------------------------- %% This notice is provided with respect to the following which may be -included with JRE 8, JDK 8, and OpenJDK 8, except where noted: +included with JRE 8, JDK 8, and OpenJDK 8. - Apache Commons Math 2.2 - Apache Derby 10.10.1.2 [included with JDK 8] - Apache Jakarta BCEL 5.2 + Apache Commons Math 3.2 + Apache Derby 10.10.1.3 + Apache Jakarta BCEL 5.1 Apache Jakarta Regexp 1.4 Apache Santuario XML Security for Java 1.5.4 Apache Xalan-Java 2.7.1 diff --git a/src/share/classes/sun/security/smartcardio/CardImpl.java b/src/share/classes/sun/security/smartcardio/CardImpl.java index 7531d2eed..1c14ea7ee 100644 --- a/src/share/classes/sun/security/smartcardio/CardImpl.java +++ b/src/share/classes/sun/security/smartcardio/CardImpl.java @@ -244,9 +244,6 @@ final class CardImpl extends Card { "sun.security.smartcardio.invertCardReset", "false"))); public void disconnect(boolean reset) throws CardException { - if (invertReset) { - reset = !reset; - } if (reset) { checkSecurity("reset"); } @@ -254,6 +251,10 @@ final class CardImpl extends Card { 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) { |