diff -r 2a338536e642 -r f9cb6e427f9e jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java
--- a/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java	Fri Sep 18 11:31:15 2015 -0700
+++ b/jdk/src/java.desktop/share/classes/sun/java2d/NullSurfaceData.java	Sat Sep 19 15:45:59 2015 -0700
@@ -63,7 +63,7 @@
         return this;
     }
 
-    private final static NullPipe nullpipe = new NullPipe();
+    private static final NullPipe nullpipe = new NullPipe();
 
     public void validatePipe(SunGraphics2D sg2d) {
         sg2d.drawpipe = nullpipe;