aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs5
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs7
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 67ba016..7e0a4ba 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -384,7 +384,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
384 System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing 384 System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing
385 shutdownTimer.AutoReset = false; 385 shutdownTimer.AutoReset = false;
386 shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed); 386 shutdownTimer.Elapsed += new ElapsedEventHandler(shutdownTimer_Elapsed);
387 shutdownTimer.Start(); 387 lock (shutdownTimer)
388 {
389 shutdownTimer.Start();
390 }
388 391
389 responseData["success"] = true; 392 responseData["success"] = true;
390 } 393 }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 59431bb..4e03e67 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -2177,13 +2177,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2177 watchDog.Interval = interval; 2177 watchDog.Interval = interval;
2178 watchDog.AutoReset = false; 2178 watchDog.AutoReset = false;
2179 watchDog.Enabled = true; 2179 watchDog.Enabled = true;
2180 watchDog.Start(); 2180 lock (watchDog)
2181 watchDog.Start();
2182
2181 } 2183 }
2182 2184
2183 internal void stopWD() 2185 internal void stopWD()
2184 { 2186 {
2185 Rest.Log.DebugFormat("{0} Reset watchdog", MsgId); 2187 Rest.Log.DebugFormat("{0} Reset watchdog", MsgId);
2186 watchDog.Stop(); 2188 lock (watchDog)
2189 watchDog.Stop();
2187 } 2190 }
2188 2191
2189 /// <summary> 2192 /// <summary>