diff options
author | Melanie Thielker | 2008-11-01 15:10:45 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-01 15:10:45 +0000 |
commit | 4fb2d7037358c320540edc3b2f5660e3cb3531a6 (patch) | |
tree | c97f8d429396c8ac11a5d4df411506c4f4902df4 /OpenSim/Data/MySQL/MySQLGridData.cs | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-4fb2d7037358c320540edc3b2f5660e3cb3531a6.zip opensim-SC-4fb2d7037358c320540edc3b2f5660e3cb3531a6.tar.gz opensim-SC-4fb2d7037358c320540edc3b2f5660e3cb3531a6.tar.bz2 opensim-SC-4fb2d7037358c320540edc3b2f5660e3cb3531a6.tar.xz |
A stab a getting the user server to act right. Move acquisition of the
locks to just before the try/catch/finally block, so that an exception
thrown between taking the lock and entering the try doesn't leave a mutex
locked
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLGridData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGridData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 26a8591..b6d481c 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
@@ -403,10 +403,10 @@ namespace OpenSim.Data.MySQL | |||
403 | /// <returns>The sim profile</returns> | 403 | /// <returns>The sim profile</returns> |
404 | override public RegionProfileData GetProfileByString(string regionName) | 404 | override public RegionProfileData GetProfileByString(string regionName) |
405 | { | 405 | { |
406 | MySQLSuperManager dbm = GetLockedConnection(); | ||
407 | |||
408 | if (regionName.Length > 2) | 406 | if (regionName.Length > 2) |
409 | { | 407 | { |
408 | MySQLSuperManager dbm = GetLockedConnection(); | ||
409 | |||
410 | try | 410 | try |
411 | { | 411 | { |
412 | Dictionary<string, string> param = new Dictionary<string, string>(); | 412 | Dictionary<string, string> param = new Dictionary<string, string>(); |
@@ -436,8 +436,8 @@ namespace OpenSim.Data.MySQL | |||
436 | dbm.Release(); | 436 | dbm.Release(); |
437 | 437 | ||
438 | } | 438 | } |
439 | dbm.Release(); | ||
439 | } | 440 | } |
440 | dbm.Release(); | ||
441 | m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters"); | 441 | m_log.Error("[GRID DB]: Searched for a Region Name shorter then 3 characters"); |
442 | return null; | 442 | return null; |
443 | } | 443 | } |