diff options
Diffstat (limited to 'OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs')
-rw-r--r-- | OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs index 2e5d679..d79d369 100644 --- a/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Framework/Data.MSSQL/MSSQLInventoryData.cs | |||
@@ -39,6 +39,8 @@ namespace OpenSim.Framework.Data.MSSQL | |||
39 | /// </summary> | 39 | /// </summary> |
40 | public class MSSQLInventoryData : IInventoryData | 40 | public class MSSQLInventoryData : IInventoryData |
41 | { | 41 | { |
42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
42 | /// <summary> | 44 | /// <summary> |
43 | /// The database manager | 45 | /// The database manager |
44 | /// </summary> | 46 | /// </summary> |
@@ -159,7 +161,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
159 | catch (Exception e) | 161 | catch (Exception e) |
160 | { | 162 | { |
161 | database.Reconnect(); | 163 | database.Reconnect(); |
162 | MainLog.Instance.Error(e.ToString()); | 164 | m_log.Error(e.ToString()); |
163 | return null; | 165 | return null; |
164 | } | 166 | } |
165 | } | 167 | } |
@@ -198,7 +200,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
198 | catch (Exception e) | 200 | catch (Exception e) |
199 | { | 201 | { |
200 | database.Reconnect(); | 202 | database.Reconnect(); |
201 | MainLog.Instance.Error(e.ToString()); | 203 | m_log.Error(e.ToString()); |
202 | return null; | 204 | return null; |
203 | } | 205 | } |
204 | } | 206 | } |
@@ -244,7 +246,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
244 | catch (Exception e) | 246 | catch (Exception e) |
245 | { | 247 | { |
246 | database.Reconnect(); | 248 | database.Reconnect(); |
247 | MainLog.Instance.Error(e.ToString()); | 249 | m_log.Error(e.ToString()); |
248 | return null; | 250 | return null; |
249 | } | 251 | } |
250 | } | 252 | } |
@@ -282,7 +284,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
282 | catch (Exception e) | 284 | catch (Exception e) |
283 | { | 285 | { |
284 | database.Reconnect(); | 286 | database.Reconnect(); |
285 | MainLog.Instance.Error(e.ToString()); | 287 | m_log.Error(e.ToString()); |
286 | return null; | 288 | return null; |
287 | } | 289 | } |
288 | } | 290 | } |
@@ -315,7 +317,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
315 | } | 317 | } |
316 | catch (SqlException e) | 318 | catch (SqlException e) |
317 | { | 319 | { |
318 | MainLog.Instance.Error(e.ToString()); | 320 | m_log.Error(e.ToString()); |
319 | } | 321 | } |
320 | 322 | ||
321 | return null; | 323 | return null; |
@@ -352,7 +354,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
352 | catch (Exception e) | 354 | catch (Exception e) |
353 | { | 355 | { |
354 | database.Reconnect(); | 356 | database.Reconnect(); |
355 | MainLog.Instance.Error(e.ToString()); | 357 | m_log.Error(e.ToString()); |
356 | } | 358 | } |
357 | return null; | 359 | return null; |
358 | } | 360 | } |
@@ -377,7 +379,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
377 | } | 379 | } |
378 | catch (Exception e) | 380 | catch (Exception e) |
379 | { | 381 | { |
380 | MainLog.Instance.Error(e.ToString()); | 382 | m_log.Error(e.ToString()); |
381 | } | 383 | } |
382 | 384 | ||
383 | return null; | 385 | return null; |
@@ -412,7 +414,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
412 | catch (Exception e) | 414 | catch (Exception e) |
413 | { | 415 | { |
414 | database.Reconnect(); | 416 | database.Reconnect(); |
415 | MainLog.Instance.Error(e.ToString()); | 417 | m_log.Error(e.ToString()); |
416 | return null; | 418 | return null; |
417 | } | 419 | } |
418 | } | 420 | } |
@@ -452,7 +454,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
452 | } | 454 | } |
453 | catch (SqlException e) | 455 | catch (SqlException e) |
454 | { | 456 | { |
455 | MainLog.Instance.Error(e.ToString()); | 457 | m_log.Error(e.ToString()); |
456 | } | 458 | } |
457 | } | 459 | } |
458 | 460 | ||
@@ -511,7 +513,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
511 | } | 513 | } |
512 | catch (Exception e) | 514 | catch (Exception e) |
513 | { | 515 | { |
514 | MainLog.Instance.Error(e.ToString()); | 516 | m_log.Error(e.ToString()); |
515 | } | 517 | } |
516 | } | 518 | } |
517 | 519 | ||
@@ -533,7 +535,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
533 | catch (SqlException e) | 535 | catch (SqlException e) |
534 | { | 536 | { |
535 | database.Reconnect(); | 537 | database.Reconnect(); |
536 | MainLog.Instance.Error(e.ToString()); | 538 | m_log.Error(e.ToString()); |
537 | } | 539 | } |
538 | } | 540 | } |
539 | 541 | ||
@@ -564,7 +566,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
564 | } | 566 | } |
565 | catch (Exception e) | 567 | catch (Exception e) |
566 | { | 568 | { |
567 | MainLog.Instance.Error(e.ToString()); | 569 | m_log.Error(e.ToString()); |
568 | } | 570 | } |
569 | } | 571 | } |
570 | 572 | ||
@@ -602,7 +604,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
602 | } | 604 | } |
603 | catch (Exception e) | 605 | catch (Exception e) |
604 | { | 606 | { |
605 | MainLog.Instance.Error(e.ToString()); | 607 | m_log.Error(e.ToString()); |
606 | } | 608 | } |
607 | } | 609 | } |
608 | 610 | ||
@@ -628,7 +630,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
628 | } | 630 | } |
629 | catch (Exception e) | 631 | catch (Exception e) |
630 | { | 632 | { |
631 | MainLog.Instance.Error(e.ToString()); | 633 | m_log.Error(e.ToString()); |
632 | } | 634 | } |
633 | } | 635 | } |
634 | 636 | ||
@@ -675,7 +677,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
675 | catch (SqlException e) | 677 | catch (SqlException e) |
676 | { | 678 | { |
677 | database.Reconnect(); | 679 | database.Reconnect(); |
678 | MainLog.Instance.Error(e.ToString()); | 680 | m_log.Error(e.ToString()); |
679 | } | 681 | } |
680 | } | 682 | } |
681 | 683 | ||
@@ -695,7 +697,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
695 | catch (SqlException e) | 697 | catch (SqlException e) |
696 | { | 698 | { |
697 | database.Reconnect(); | 699 | database.Reconnect(); |
698 | MainLog.Instance.Error(e.ToString()); | 700 | m_log.Error(e.ToString()); |
699 | } | 701 | } |
700 | } | 702 | } |
701 | 703 | ||