Mercurial > octave

comparison libinterp/octave-value/ov-java.cc @ 28490:d2fd4616829b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove OctClassLoader from JVM start options (bug #55174). * ov-java.cc (initialize_jvm): Remove call to vm_args.add() with OctClassLoader option.
author Philip Nienhuis <prnienhuis@users.sf.net>
date Fri, 19 Jun 2020 20:04:24 +0200
parents b018f553fd85
children d4e8887117b7 9e7b2625e574
comparison
equal deleted inserted replaced
28487:a7fcdac012d8 28490:d2fd4616829b
615 //! it by setting #jvm_attached. Otherwise, create a #jvm with some hard- 615 //! it by setting #jvm_attached. Otherwise, create a #jvm with some hard-
616 //! coded options: 616 //! coded options:
617 //! 617 //!
618 //! - '-Djava.class.path=classpath', where @c classpath is given by 618 //! - '-Djava.class.path=classpath', where @c classpath is given by
619 //! #initial_class_path(). 619 //! #initial_class_path().
620 //! - '-Djava.system.class.loader=org.octave.OctClassLoader'.
621 //! - '-Xrs' 620 //! - '-Xrs'
622 //! 621 //!
623 //! Further options are read from the file @c java.opts in the directory given 622 //! Further options are read from the file @c java.opts in the directory given
624 //! by #java_init_dir(). 623 //! by #java_init_dir().
625 //! 624 //!
765 764
766 octave::JVMArgs vm_args; 765 octave::JVMArgs vm_args;
767 766
768 // Hard-coded options for the jvm. 767 // Hard-coded options for the jvm.
769 vm_args.add ("-Djava.class.path=" + initial_class_path ()); 768 vm_args.add ("-Djava.class.path=" + initial_class_path ());
770 vm_args.add ("-Djava.system.class.loader=org.octave.OctClassLoader");
771 vm_args.add ("-Xrs"); 769 vm_args.add ("-Xrs");
772 770
773 // Additional options given by file java.opts. 771 // Additional options given by file java.opts.
774 vm_args.read_java_opts (initial_java_dir () + 772 vm_args.read_java_opts (initial_java_dir () +
775 octave::sys::file_ops::dir_sep_str () + 773 octave::sys::file_ops::dir_sep_str () +