applied_patches/0087-jvmfwk-modified-javavendors-xml.diff

   1 --- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.old        2009-01-21 15:49:34.000000000 +0100
   2 +++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx    2009-03-19 14:38:21.000000000 +0100
   3 @@ -82,12 +82,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
   4      JavaInfo * pInfo = NULL;
   5      errcode = jfw_getSelectedJRE( & pInfo);
   6
   7 -    if (errcode == JFW_E_INVALID_SETTINGS)
   8 -    {
   9 -        fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!");
  10 -        return -1;
  11 -    }
  12 -    else if (errcode != JFW_E_NONE)
  13 +    if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
  14      {
  15          fprintf(stderr,"javaldx failed! \n");
  16          return -1;