[hbase] branch branch-2 updated: HBASE-25841 Add basic jshell support (addendum)

[nd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ndimiduk pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new f7358cd  HBASE-25841 Add basic jshell support (addendum)
f7358cd is described below

commit f7358cd618578caebe61b69c0a43ae419c76005a
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Tue May 25 09:17:47 2021 -0700

    HBASE-25841 Add basic jshell support (addendum)
---
 bin/hbase | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/hbase b/bin/hbase
index 1651608..38db744 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -510,9 +510,6 @@ if [[ $jruby_needed ]]; then
   fi
 fi
 
-# set default values for HBASE_JSHELL_ARGS
-read -r -a JSHELL_ARGS <<< "${HBASE_JSHELL_ARGS:-"--startup DEFAULT --startup PRINTING --startup ${HBASE_HOME}/bin/hbase_startup.jsh"}"
-
 # figure out which class to run
 if [ "$COMMAND" = "shell" ] ; then
 	#find the hbase ruby sources
@@ -540,6 +537,8 @@ elif [ "$COMMAND" = 'jshell' ] ; then
     exit 1
   fi
   CLASS='jdk.internal.jshell.tool.JShellToolProvider'
+  # set default values for HBASE_JSHELL_ARGS
+  read -r -a JSHELL_ARGS <<< "${HBASE_JSHELL_ARGS:-"--startup DEFAULT --startup PRINTING --startup ${HBASE_HOME}/bin/hbase_startup.jsh"}"
 elif [ "$COMMAND" = "hbck" ] ; then
   # Look for the -j /path/to/HBCK2.jar parameter. Else pass through to hbck.
   case "${1}" in