modules/jdk.packager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java

*** 154,164 ****
                      BundleParams.PARAM_APPLICATION_CLASS,
                      String.class,
                      params -> {
                          //FIXME sniff modules
                          extractMainClassInfoFromAppResources(params);
!                         return (String) params.get(BundleParams.PARAM_APPLICATION_CLASS);
                      },
                      (s, p) -> s
              );
  
      public static final StandardBundlerParam<String> APP_NAME =
--- 154,168 ----
                      BundleParams.PARAM_APPLICATION_CLASS,
                      String.class,
                      params -> {
                          //FIXME sniff modules
                          extractMainClassInfoFromAppResources(params);
!                         String s = (String) params.get(BundleParams.PARAM_APPLICATION_CLASS);
!                         if (s == null) {
!                             s = JLinkBundlerHelper.getMainClass(params);
!                         }
!                         return s;
                      },
                      (s, p) -> s
              );
  
      public static final StandardBundlerParam<String> APP_NAME =