diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs b/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs index 4b7201ce6c..a277160433 100644 --- a/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs +++ b/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs @@ -472,7 +472,5 @@ namespace osWebRtcVoice // m_log.InfoFormat(msg, args); MainConsole.Instance.Output(msg, args); } - - } } diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 520ad07064..87276692b2 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs @@ -598,11 +598,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest bool bodyTimedOut = false; HttpResponseMessage responseMessage = null; HttpRequestMessage request = null; - HttpClient client = null; try { - client = RequestModule.GetHttpClient(HttpVerifyCert); + HttpClient client = RequestModule.GetHttpClient(HttpVerifyCert); request = new (new HttpMethod(HttpMethod), Url); int datalen; @@ -685,10 +684,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest Status = e.StatusCode is null ? 499 : (int)e.StatusCode; ResponseBody = e.Message; } - //catch (Exception e) - catch + catch (Exception e) { - // Don't crash on anything else + Status = 499; + ResponseBody = e.Message; } finally { @@ -780,7 +779,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest responseMessage?.Dispose(); request?.Dispose(); - client?.Dispose(); } }