From 904088ac726d615abe5a5730954debee3c3ce57a Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Thu, 7 Mar 2019 13:57:25 +0100
Subject: [PATCH] net/http: fix ambiguous else warning in THttpServer
---
net/http/src/THttpServer.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/http/src/THttpServer.cxx b/net/http/src/THttpServer.cxx
index 579e9c02f21..c0c495fd5cd 100644
--- a/net/http/src/THttpServer.cxx
+++ b/net/http/src/THttpServer.cxx
@@ -142,11 +142,12 @@ THttpServer::THttpServer(const char *engine) : TNamed("http", "ROOT http server"
if (!jsrootsys)
jsrootsys = gEnv->GetValue("HttpServ.JSRootPath", jsrootsys);
- if (jsrootsys && *jsrootsys)
+ if (jsrootsys && *jsrootsys) {
if ((strncmp(jsrootsys, "http://", 7)==0) || (strncmp(jsrootsys, "https://", 8)==0))
fJSROOT = jsrootsys;
else
fJSROOTSYS = jsrootsys;
+ }
if (fJSROOTSYS.Length() == 0) {
TString jsdir = TString::Format("%s/js", TROOT::GetDataDir().Data());
--
GitLab