diff options
author | Dr Scofield | 2009-05-18 10:04:28 +0000 |
---|---|---|
committer | Dr Scofield | 2009-05-18 10:04:28 +0000 |
commit | e3f2cfa1ca8dab6e4e901fb2dbcc200131751aed (patch) | |
tree | 739d0ce05a8c8626dc1f9ddd42808f08de2af709 /OpenSim/Region | |
parent | fixing XmlWriter problem (diff) | |
download | opensim-SC-e3f2cfa1ca8dab6e4e901fb2dbcc200131751aed.zip opensim-SC-e3f2cfa1ca8dab6e4e901fb2dbcc200131751aed.tar.gz opensim-SC-e3f2cfa1ca8dab6e4e901fb2dbcc200131751aed.tar.bz2 opensim-SC-e3f2cfa1ca8dab6e4e901fb2dbcc200131751aed.tar.xz |
From: Alan Webb <alan_webb@us.ibm.com>
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)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | 4 |
2 files changed, 3 insertions, 2 deletions
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 | |||
460 | // request.Credentials = credentials; | 460 | // request.Credentials = credentials; |
461 | 461 | ||
462 | request.ContentLength = 0; | 462 | request.ContentLength = 0; |
463 | request.KeepAlive = false; | ||
463 | 464 | ||
464 | WebResponse response = request.GetResponse(); | 465 | WebResponse response = request.GetResponse(); |
465 | Stream file = response.GetResponseStream(); | 466 | 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 | |||
37 | { | 37 | { |
38 | public class Executor : MarshalByRefObject | 38 | public class Executor : MarshalByRefObject |
39 | { | 39 | { |
40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | /// <summary> | 42 | /// <summary> |
43 | /// Contains the script to execute functions in. | 43 | /// Contains the script to execute functions in. |
@@ -173,7 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
173 | } | 173 | } |
174 | catch | 174 | catch |
175 | { | 175 | { |
176 | m_log.Error("Event "+EventName+" not found."); | 176 | // m_log.Error("Event "+EventName+" not found."); |
177 | // Event name not found, cache it as not found | 177 | // Event name not found, cache it as not found |
178 | Events.Add(EventName, null); | 178 | Events.Add(EventName, null); |
179 | } | 179 | } |