From ea755d1b23eb653eee40789f00e0300546afaf8a Mon Sep 17 00:00:00 2001
From: coffeys <unknown>
Date: Wed, 23 Jul 2014 20:14:02 +0100
Subject: [PATCH] 8051614: smartcardio TCK tests fail due to lack of 'reset'
 permission Reviewed-by: valeriep

---
 src/share/classes/sun/security/smartcardio/CardImpl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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) {
-- 
GitLab