From 2b4f25f8e6a413cd8911640579f8c19f8c4caf59 Mon Sep 17 00:00:00 2001
From: Thomas Jakway <tjakway@nyu.edu>
Date: Sun, 17 Jun 2018 16:31:19 -0700
Subject: [PATCH] don't die when java prints tool options

---
 solr/bin/solr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index 6612f2cd556a..3459152fb587 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -124,7 +124,7 @@ if [ -z "$SOLR_STOP_WAIT" ]; then
   SOLR_STOP_WAIT=180
 fi
 # test that Java exists, is executable and correct version
-JAVA_VER=$("$JAVA" -version 2>&1)
+JAVA_VER=$("$JAVA" -version 2>&1 | grep -v -E '^[pP]icked up (_JAVA_OPTIONS|JAVA_TOOL_OPTIONS):' )
 if [[ $? -ne 0 ]] ; then
   echo >&2 "Java not found, or an error was encountered when running java."
   echo >&2 "A working Java $JAVA_VER_REQ JRE is required to run Solr!"