From e3f2cfa1ca8dab6e4e901fb2dbcc200131751aed Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 18 May 2009 10:04:28 +0000 Subject: From: Alan Webb Fixes: [1] Sharing exception on remote OAR management [2] Occasional 505 error talking to Tomcat [3] Occasional mono aborts caused by mlog in the script engine's app domain (mono 2.4) --- OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 1 + OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index a5ceb19..e3d2aee 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -460,6 +460,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver // request.Credentials = credentials; request.ContentLength = 0; + request.KeepAlive = false; WebResponse response = request.GetResponse(); Stream file = response.GetResponseStream(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 3a73674..fc9db83 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { public class Executor : MarshalByRefObject { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Contains the script to execute functions in. @@ -173,7 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase } catch { - m_log.Error("Event "+EventName+" not found."); + // m_log.Error("Event "+EventName+" not found."); // Event name not found, cache it as not found Events.Add(EventName, null); } -- cgit v1.1