From 00602a3a7a3f6542ff2993bf6f2fb8f6edbd9c22 Mon Sep 17 00:00:00 2001
From: Mikhail Khludnev <mkhl@apache.org>
Date: Fri, 3 Jun 2016 01:05:28 +0300
Subject: [PATCH] SOLR-8676: keep LOG4J_CONFIG in solr.cmd

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

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 13e51a2f62f..0c8ebe99126 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -253,6 +253,8 @@ Bug Fixes
 
 * SOLR-8612: closing JDBC Statement on failures in DataImportHandler (DIH) (Kristine Jetzke via Mikhail Khludnev)
 
+* SOLR-8676: keep LOG4J_CONFIG in solr.cmd (Kristine Jetzke via Mikhail Khludnev)
+
 Optimizations
 ----------------------
 * SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index a8d71c43bf2..6889befef95 100644
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -657,7 +657,6 @@ IF "%STOP_KEY%"=="" set STOP_KEY=solrrocks
 @REM so that we can write logs for examples to %SOLR_HOME%\..\logs
 set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs"
 set "EXAMPLE_DIR=%SOLR_TIP%\example"
-set LOG4J_CONFIG=
 set TMP=!SOLR_HOME:%EXAMPLE_DIR%=!
 IF NOT "%TMP%"=="%SOLR_HOME%" (
   set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs"