src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/options/Options.java

*** 40,49 ****
--- 40,50 ----
  import java.util.LinkedList;
  import java.util.List;
  import java.util.Locale;
  import java.util.Map;
  import java.util.MissingResourceException;
+ import java.util.Objects;
  import java.util.PropertyPermission;
  import java.util.ResourceBundle;
  import java.util.StringTokenizer;
  import java.util.TimeZone;
  import java.util.TreeMap;
*** 141,151 ****
       * @param name of boolean property
       * @param defValue default value of boolean property
       * @return true if set to true, default value if unset or set to false
       */
      public static boolean getBooleanProperty(final String name, final Boolean defValue) {
!         name.getClass(); // null check
          if (!name.startsWith("nashorn.")) {
              throw new IllegalArgumentException(name);
          }
  
          return AccessController.doPrivileged(
--- 142,152 ----
       * @param name of boolean property
       * @param defValue default value of boolean property
       * @return true if set to true, default value if unset or set to false
       */
      public static boolean getBooleanProperty(final String name, final Boolean defValue) {
!         Objects.requireNonNull(name);
          if (!name.startsWith("nashorn.")) {
              throw new IllegalArgumentException(name);
          }
  
          return AccessController.doPrivileged(
*** 182,192 ****
       * @param name of string property
       * @param defValue the default value if unset
       * @return string property if set or default value
       */
      public static String getStringProperty(final String name, final String defValue) {
!         name.getClass(); // null check
          if (! name.startsWith("nashorn.")) {
              throw new IllegalArgumentException(name);
          }
  
          return AccessController.doPrivileged(
--- 183,193 ----
       * @param name of string property
       * @param defValue the default value if unset
       * @return string property if set or default value
       */
      public static String getStringProperty(final String name, final String defValue) {
!         Objects.requireNonNull(name);
          if (! name.startsWith("nashorn.")) {
              throw new IllegalArgumentException(name);
          }
  
          return AccessController.doPrivileged(
*** 209,219 ****
       * @param name of integer property
       * @param defValue the default value if unset
       * @return integer property if set or default value
       */
      public static int getIntProperty(final String name, final int defValue) {
!         name.getClass(); // null check
          if (! name.startsWith("nashorn.")) {
              throw new IllegalArgumentException(name);
          }
  
          return AccessController.doPrivileged(
--- 210,220 ----
       * @param name of integer property
       * @param defValue the default value if unset
       * @return integer property if set or default value
       */
      public static int getIntProperty(final String name, final int defValue) {
!         Objects.requireNonNull(name);
          if (! name.startsWith("nashorn.")) {
              throw new IllegalArgumentException(name);
          }
  
          return AccessController.doPrivileged(