aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorHomer Horwitz2008-09-19 21:32:41 +0000
committerHomer Horwitz2008-09-19 21:32:41 +0000
commit025441d722b6fa175cccb674aa4a08a34093323e (patch)
treefffff4f838a409bd0b57e82f70408f5eaff2fb41 /OpenSim/Data/SQLite
parentadd in bits to attempt to enable log4net on these tests to help when debugging (diff)
downloadopensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.zip
opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.tar.gz
opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.tar.bz2
opensim-SC_OLD-025441d722b6fa175cccb674aa4a08a34093323e.tar.xz
Small formatting cleanup, before chi11ken notices. Me bad.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs15
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs29
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs15
3 files changed, 39 insertions, 20 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 49d351a..40b61ee 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -107,19 +107,23 @@ namespace OpenSim.Data.SQLite
107 /// </summary> 107 /// </summary>
108 public void Dispose() 108 public void Dispose()
109 { 109 {
110 if(conn != null) { 110 if (conn != null)
111 {
111 conn.Close(); 112 conn.Close();
112 conn = null; 113 conn = null;
113 } 114 }
114 if(invItemsDa != null) { 115 if (invItemsDa != null)
116 {
115 invItemsDa.Dispose(); 117 invItemsDa.Dispose();
116 invItemsDa = null; 118 invItemsDa = null;
117 } 119 }
118 if(invFoldersDa != null) { 120 if (invFoldersDa != null)
121 {
119 invFoldersDa.Dispose(); 122 invFoldersDa.Dispose();
120 invFoldersDa = null; 123 invFoldersDa = null;
121 } 124 }
122 if(ds != null) { 125 if (ds != null)
126 {
123 ds.Dispose(); 127 ds.Dispose();
124 ds = null; 128 ds = null;
125 } 129 }
@@ -500,7 +504,8 @@ namespace OpenSim.Data.SQLite
500 // Current folder already has a sibling - append to sibling list 504 // Current folder already has a sibling - append to sibling list
501 hashtable[curFolder.ParentID].Add(curFolder); 505 hashtable[curFolder.ParentID].Add(curFolder);
502 } 506 }
503 else { 507 else
508 {
504 List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>(); 509 List<InventoryFolderBase> siblingList = new List<InventoryFolderBase>();
505 siblingList.Add(curFolder); 510 siblingList.Add(curFolder);
506 // Current folder has no known (yet) siblings 511 // Current folder has no known (yet) siblings
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index f71535f..13f9938 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -205,44 +205,53 @@ namespace OpenSim.Data.SQLite
205 205
206 public void Dispose() 206 public void Dispose()
207 { 207 {
208 if(m_conn != null) { 208 if (m_conn != null)
209 {
209 m_conn.Close(); 210 m_conn.Close();
210 m_conn = null; 211 m_conn = null;
211 } 212 }
212 if(ds != null) { 213 if (ds != null)
214 {
213 ds.Dispose(); 215 ds.Dispose();
214 ds = null; 216 ds = null;
215 } 217 }
216 if(primDa != null) { 218 if (primDa != null)
219 {
217 primDa.Dispose(); 220 primDa.Dispose();
218 primDa = null; 221 primDa = null;
219 } 222 }
220 if(shapeDa != null) { 223 if (shapeDa != null)
224 {
221 shapeDa.Dispose(); 225 shapeDa.Dispose();
222 shapeDa = null; 226 shapeDa = null;
223 } 227 }
224 if(itemsDa != null) { 228 if (itemsDa != null)
229 {
225 itemsDa.Dispose(); 230 itemsDa.Dispose();
226 itemsDa = null; 231 itemsDa = null;
227 } 232 }
228 if(terrainDa != null) { 233 if (terrainDa != null)
234 {
229 terrainDa.Dispose(); 235 terrainDa.Dispose();
230 terrainDa = null; 236 terrainDa = null;
231 } 237 }
232 if(landDa != null) { 238 if (landDa != null)
239 {
233 landDa.Dispose(); 240 landDa.Dispose();
234 landDa = null; 241 landDa = null;
235 } 242 }
236 if(landAccessListDa != null) { 243 if (landAccessListDa != null)
244 {
237 landAccessListDa.Dispose(); 245 landAccessListDa.Dispose();
238 landAccessListDa = null; 246 landAccessListDa = null;
239 } 247 }
240 if(regionSettingsDa != null) { 248 if (regionSettingsDa != null)
249 {
241 regionSettingsDa.Dispose(); 250 regionSettingsDa.Dispose();
242 regionSettingsDa = null; 251 regionSettingsDa = null;
243 } 252 }
244 } 253 }
245 254
246 public void StoreRegionSettings(RegionSettings rs) 255 public void StoreRegionSettings(RegionSettings rs)
247 { 256 {
248 lock (ds) 257 lock (ds)
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index a238ebf..f847ba9 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -124,23 +124,28 @@ namespace OpenSim.Data.SQLite
124 124
125 public override void Dispose () 125 public override void Dispose ()
126 { 126 {
127 if(g_conn != null) { 127 if (g_conn != null)
128 {
128 g_conn.Close(); 129 g_conn.Close();
129 g_conn = null; 130 g_conn = null;
130 } 131 }
131 if(ds != null) { 132 if (ds != null)
133 {
132 ds.Dispose(); 134 ds.Dispose();
133 ds = null; 135 ds = null;
134 } 136 }
135 if(da != null) { 137 if (da != null)
138 {
136 da.Dispose(); 139 da.Dispose();
137 da = null; 140 da = null;
138 } 141 }
139 if(daf != null) { 142 if (daf != null)
143 {
140 daf.Dispose(); 144 daf.Dispose();
141 daf = null; 145 daf = null;
142 } 146 }
143 if(dua != null) { 147 if (dua != null)
148 {
144 dua.Dispose(); 149 dua.Dispose();
145 dua = null; 150 dua = null;
146 } 151 }