diff libinterp/octave-value/ov-java.cc @ 20957:9db35d2042be

maint: eliminate special cases of statements after error. * daspk.cc: Eliminate DASPK_ABORT, DASPK_ABORT1, DASPK_ABORT2 macros. * dasrt.cc: Eliminate DASRT_ABORT, DASRT_ABORT1, DASRT_ABORT2 macros. * dassl.cc: Eliminate DASSL_ABORT, DASSL_ABORT1, DASSL_ABORT2 macros. libinterp/corefcn/graphics.cc (Fdrawnow): Reverse order and call gh_manager::unlock() before call to error(). * variables.cc (Fmlock): Adjust indentation. * __glpk__.cc (glpk): Add FIXME note about unreachable code. * __init_fltk__.cc (F__fltk_check__, F__init_fltk__): Place return statement within #ifdef HAVE_FLTK block. * ov-fcn-handle.cc (load_hdf5): eliminate useless statements after error. * ov-java.cc (F__java_exit__): Place return statement within #ifdef HAVE_JAVA block. * octave.cc (octave_process_command_line): Issue warning, which will return, and then call octave_print_terse_usage_and_exit. * lex.ll: Add FIXME notes about unreachable code. * oct-parse.in.yy (source_file): Eliminate useless return after error.
author Rik <rik@octave.org>
date Sun, 20 Dec 2015 15:31:53 -0800
parents 77f5591878bf
children 1edf15793cac
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Sun Dec 20 13:26:17 2015 -0800
+++ b/libinterp/octave-value/ov-java.cc	Sun Dec 20 15:31:53 2015 -0800
@@ -2103,11 +2103,12 @@
 {
 #ifdef HAVE_JAVA
   terminate_jvm ();
+
+  return ovl ();
+
 #else
   error ("__java_init__: Octave was not compiled with Java interface");
 #endif
-
-  return octave_value ();
 }
 
 DEFUN (javaObject, args, ,