--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java	Tue Sep 15 21:56:04 2015 -0700
@@ -48,7 +48,7 @@
 class WindowsWatchService
     extends AbstractWatchService
 {
-    private final static int WAKEUP_COMPLETION_KEY = 0;
+    private static final int WAKEUP_COMPLETION_KEY = 0;
 
     // background thread to service I/O completion port
     private final Poller poller;
@@ -242,7 +242,7 @@
      * Background thread to service I/O completion port.
      */
     private static class Poller extends AbstractPoller {
-        private final static Unsafe UNSAFE = Unsafe.getUnsafe();
+        private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
         /*
          * typedef struct _OVERLAPPED {