--- old/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java	2016-05-30 16:31:31.000000000 +0100
+++ new/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java	2016-05-30 16:31:31.000000000 +0100
@@ -272,9 +272,11 @@
                 for (WatchEvent.Modifier modifier: modifiers) {
                     if (modifier == null)
                         return new NullPointerException();
-                    if (modifier instanceof com.sun.nio.file.SensitivityWatchEventModifier)
-                        continue; // ignore
-                    return new UnsupportedOperationException("Modifier not supported");
+                    if (!ExtendedOptions.SENSITIVITY_HIGH.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_MEDIUM.matches(modifier) &&
+                            !ExtendedOptions.SENSITIVITY_LOW.matches(modifier)) {
+                        return new UnsupportedOperationException("Modifier not supported");
+                    }
                 }
             }