diff options
author | Jeff Ames | 2009-11-23 11:26:06 +0900 |
---|---|---|
committer | Jeff Ames | 2009-11-23 11:26:06 +0900 |
commit | 9f5c2acd128828d220bf7e47bd4fe13d7a2a910b (patch) | |
tree | bb1a273746c4b2a466dd705537a2457f0474faa2 /OpenSim/Framework | |
parent | * Added missing lock to m_forcelist when AddForce is called. When a user dr... (diff) | |
download | opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.zip opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.gz opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.bz2 opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Tests/ACLTest.cs | 29 | ||||
-rw-r--r-- | OpenSim/Framework/Tests/CacheTests.cs | 31 |
3 files changed, 58 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index cc8bdb6..1cc19c5 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
50 | private readonly BaseHttpServer m_server; | 50 | private readonly BaseHttpServer m_server; |
51 | private BlockingQueue<PollServiceHttpRequest> m_request; | 51 | private BlockingQueue<PollServiceHttpRequest> m_request; |
52 | private bool m_running = true; | 52 | private bool m_running = true; |
53 | private int m_timeout = 250; | 53 | private int m_timeout = 250; |
54 | 54 | ||
55 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) | 55 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) |
56 | { | 56 | { |
diff --git a/OpenSim/Framework/Tests/ACLTest.cs b/OpenSim/Framework/Tests/ACLTest.cs index d11f307..06e860e 100644 --- a/OpenSim/Framework/Tests/ACLTest.cs +++ b/OpenSim/Framework/Tests/ACLTest.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using NUnit.Framework; | 29 | using NUnit.Framework; |
3 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
4 | 31 | ||
diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs index 8e97232..e2afd2a 100644 --- a/OpenSim/Framework/Tests/CacheTests.cs +++ b/OpenSim/Framework/Tests/CacheTests.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using NUnit.Framework; | 29 | using NUnit.Framework; |
3 | using OpenMetaverse; | 30 | using OpenMetaverse; |
4 | 31 | ||
@@ -38,7 +65,7 @@ namespace OpenSim.Framework.Tests | |||
38 | randomNotIn = UUID.Random(); | 65 | randomNotIn = UUID.Random(); |
39 | } | 66 | } |
40 | object citem = cache.Get(randomNotIn.ToString()); | 67 | object citem = cache.Get(randomNotIn.ToString()); |
41 | Assert.That(citem == null, "Item should not be in Cache" ); | 68 | Assert.That(citem == null, "Item should not be in Cache"); |
42 | } | 69 | } |
43 | 70 | ||
44 | //NOTE: Test Case disabled until Cache is fixed | 71 | //NOTE: Test Case disabled until Cache is fixed |