diff options
author | Justin Clark-Casey (justincc) | 2014-07-02 23:48:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-02 23:49:25 +0100 |
commit | 889194db63016ad4b9ecb0c6ae82d3d9c7632c95 (patch) | |
tree | 823eba42a9ce5fcb04b8c7e1ff6e50deedc726f6 /OpenSim/Framework/Util.cs | |
parent | minor: Change default max phys prim size in code to match OpenSimDefaults.ini (diff) | |
download | opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.zip opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.tar.gz opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.tar.bz2 opensim-SC_OLD-889194db63016ad4b9ecb0c6ae82d3d9c7632c95.tar.xz |
Actually call Close() for shared region modules when the simulator is being shutdown.
Adds regression test for this case.
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r-- | OpenSim/Framework/Util.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 740e55a..729281c 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -1964,10 +1964,15 @@ namespace OpenSim.Framework | |||
1964 | { | 1964 | { |
1965 | if (maxThreads < 2) | 1965 | if (maxThreads < 2) |
1966 | throw new ArgumentOutOfRangeException("maxThreads", "maxThreads must be greater than 2"); | 1966 | throw new ArgumentOutOfRangeException("maxThreads", "maxThreads must be greater than 2"); |
1967 | |||
1967 | if (minThreads > maxThreads || minThreads < 2) | 1968 | if (minThreads > maxThreads || minThreads < 2) |
1968 | throw new ArgumentOutOfRangeException("minThreads", "minThreads must be greater than 2 and less than or equal to maxThreads"); | 1969 | throw new ArgumentOutOfRangeException("minThreads", "minThreads must be greater than 2 and less than or equal to maxThreads"); |
1970 | |||
1969 | if (m_ThreadPool != null) | 1971 | if (m_ThreadPool != null) |
1970 | throw new InvalidOperationException("SmartThreadPool is already initialized"); | 1972 | { |
1973 | m_log.Warn("SmartThreadPool is already initialized. Ignoring request."); | ||
1974 | return; | ||
1975 | } | ||
1971 | 1976 | ||
1972 | STPStartInfo startInfo = new STPStartInfo(); | 1977 | STPStartInfo startInfo = new STPStartInfo(); |
1973 | startInfo.ThreadPoolName = "Util"; | 1978 | startInfo.ThreadPoolName = "Util"; |