You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/09/26 11:50:03 UTC

[32/45] lucene-solr:jira/solr-12709: SOLR-12776: Setting of TMP in solr.cmd causes invisibility of Solr to JDK tools

SOLR-12776: Setting of TMP in solr.cmd causes invisibility of Solr to JDK tools


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/95cc6f4f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/95cc6f4f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/95cc6f4f

Branch: refs/heads/jira/solr-12709
Commit: 95cc6f4f765f0e1f78e5199868089df1ffec91e9
Parents: e6e3dc7
Author: Erick Erickson <Er...@gmail.com>
Authored: Sun Sep 23 16:03:30 2018 -0700
Committer: Erick Erickson <Er...@gmail.com>
Committed: Sun Sep 23 16:03:30 2018 -0700

----------------------------------------------------------------------
 solr/CHANGES.txt  | 1 +
 solr/bin/solr.cmd | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/95cc6f4f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0f97dcf..2c4903b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -107,6 +107,7 @@ Bug Fixes
 * SOLR-11836: FacetStream works with bucketSizeLimit of -1 which will fetch all the buckets.
   (Alfonso Muñoz-Pomer Fuentes, Amrit Sarkar via Varun Thacker)
 
+* SOLR-12776: Setting of TMP in solr.cmd causes invisibility of Solr to JDK tools (Petr Bodnar via Erick Erickson)
 
 ==================  7.5.0 ==================
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/95cc6f4f/solr/bin/solr.cmd
----------------------------------------------------------------------
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 1750c2f..005ea59 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -981,8 +981,8 @@ IF [%SOLR_LOGS_DIR%] == [] (
 )
 
 set "EXAMPLE_DIR=%SOLR_TIP%\example"
-set TMP=!SOLR_HOME:%EXAMPLE_DIR%=!
-IF NOT "%TMP%"=="%SOLR_HOME%" (
+set TMP_SOLR_HOME=!SOLR_HOME:%EXAMPLE_DIR%=!
+IF NOT "%TMP_SOLR_HOME%"=="%SOLR_HOME%" (
   set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs"
   set "LOG4J_CONFIG=file:///%SOLR_SERVER_DIR%\resources\log4j2.xml"
 )