aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-01-01 22:51:00 +0000
committerMelanie2010-01-01 22:51:00 +0000
commit0d9591bf3562955a39c57dd289d0cc0bb0ba85a3 (patch)
treec0ee2bf1f6227c2aa2e9c3c3726bbba6ef75de8e
parentPut PassCollision on the ignore list for testing, since we don't save that (diff)
downloadopensim-SC_OLD-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.zip
opensim-SC_OLD-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.tar.gz
opensim-SC_OLD-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.tar.bz2
opensim-SC_OLD-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.tar.xz
Prevent the creation of duplicate inventory folders in the case of a login
database issue. Now the login will instaead fail later.
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs13
2 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index d560c5f..f7b286f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Data.MySQL
264 { 264 {
265 database.Reconnect(); 265 database.Reconnect();
266 m_log.Error(e.ToString()); 266 m_log.Error(e.ToString());
267 return null; 267 throw;
268 } 268 }
269 } 269 }
270 270
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index d4da4d3..95007f1 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using System.Reflection; 30using System.Reflection;
30using log4net; 31using log4net;
@@ -102,7 +103,17 @@ namespace OpenSim.Services.InventoryService
102 // See IInventoryServices 103 // See IInventoryServices
103 public bool CreateUserInventory(UUID user) 104 public bool CreateUserInventory(UUID user)
104 { 105 {
105 InventoryFolderBase existingRootFolder = GetRootFolder(user); 106 InventoryFolderBase existingRootFolder;
107 try
108 {
109 existingRootFolder = GetRootFolder(user);
110 }
111 catch (Exception e)
112 {
113 // Munch the exception, it has already been reported
114 //
115 return false;
116 }
106 117
107 if (null != existingRootFolder) 118 if (null != existingRootFolder)
108 { 119 {