src/share/classes/sun/nio/fs/AbstractWatchService.java

*** 31,49 ****
  
  /**
   * Base implementation class for watch services.
   */
  
! abstract class AbstractWatchService extends WatchService {
  
      // signaled keys waiting to be dequeued
      private final LinkedBlockingDeque<WatchKey> pendingKeys =
          new LinkedBlockingDeque<WatchKey>();
  
      // special key to indicate that watch service is closed
      private final WatchKey CLOSE_KEY =
!         new AbstractWatchKey(null) {
              @Override
              public boolean isValid() {
                  return true;
              }
  
--- 31,49 ----
  
  /**
   * Base implementation class for watch services.
   */
  
! abstract class AbstractWatchService implements WatchService {
  
      // signaled keys waiting to be dequeued
      private final LinkedBlockingDeque<WatchKey> pendingKeys =
          new LinkedBlockingDeque<WatchKey>();
  
      // special key to indicate that watch service is closed
      private final WatchKey CLOSE_KEY =
!         new AbstractWatchKey(null, null) {
              @Override
              public boolean isValid() {
                  return true;
              }
  
*** 52,62 ****
              }
          };
  
      // used when closing watch service
      private volatile boolean closed;
!     private Object closeLock = new Object();
  
      protected AbstractWatchService() {
      }
  
      /**
--- 52,62 ----
              }
          };
  
      // used when closing watch service
      private volatile boolean closed;
!     private final Object closeLock = new Object();
  
      protected AbstractWatchService() {
      }
  
      /**