# HG changeset patch
# User Rik <rik@octave.org>
# Date 1592670476 25200
# Node ID d4e8887117b746476752f630091ab9e29cc7fc42
# Parent  aabfd3f51d0bdbb41e317208688f034c3273f510# Parent  d2fd4616829b078132ebf7b7ce9d580f65297f01
maint: merge stable to default.

diff -r aabfd3f51d0b -r d4e8887117b7 libinterp/octave-value/ov-java.cc
--- a/libinterp/octave-value/ov-java.cc	Sat Jun 20 14:09:09 2020 +0200
+++ b/libinterp/octave-value/ov-java.cc	Sat Jun 20 09:27:56 2020 -0700
@@ -613,7 +613,6 @@
 //!
 //! - '-Djava.class.path=classpath', where @c classpath is given by
 //!   #initial_class_path().
-//! - '-Djava.system.class.loader=org.octave.OctClassLoader'.
 //! - '-Xrs'
 //!
 //! Further options are read from the file @c java.opts in the directory given
@@ -763,7 +762,6 @@
 
       // Hard-coded options for the jvm.
       vm_args.add ("-Djava.class.path=" + initial_class_path ());
-      vm_args.add ("-Djava.system.class.loader=org.octave.OctClassLoader");
       vm_args.add ("-Xrs");
 
       // Additional options given by file java.opts.