src/share/classes/sun/security/smartcardio/CardImpl.java

rev 12528 : 8169026: Handle smartcard clean up better
Reviewed-by: valeriep, ahgross

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 278,294 ****
              exclusiveThread = null;
          }
      }
  
      public String toString() {
!         return "PC/SC card in " + terminal.getName()
              + ", protocol " + getProtocol() + ", state " + state;
      }
  
      protected void finalize() throws Throwable {
          try {
              if (state == State.OK) {
                  SCardDisconnect(cardId, SCARD_LEAVE_CARD);
              }
          } finally {
              super.finalize();
          }
--- 278,295 ----
              exclusiveThread = null;
          }
      }
  
      public String toString() {
!         return "PC/SC card in " + terminal.name
              + ", protocol " + getProtocol() + ", state " + state;
      }
  
      protected void finalize() throws Throwable {
          try {
              if (state == State.OK) {
+                 state = State.DISCONNECTED;
                  SCardDisconnect(cardId, SCARD_LEAVE_CARD);
              }
          } finally {
              super.finalize();
          }