From 5843f595a723cd37c6b95eac8e74f9d3586fff53 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 7 May 2008 21:42:23 +0000 Subject: * Fixed some compiler warnings * Fixed prebuild.xml to remove DB4o references (more compiler warnings) --- OpenSim/Data/NHibernate/NHibernateAssetData.cs | 2 +- OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 2 +- OpenSim/Data/NHibernate/NHibernateUserData.cs | 5 +++-- OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index c0dd322..e52f633 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs @@ -100,7 +100,7 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { session.Load(typeof(AssetBase), LLUUID.Zero); } - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index 77b9b01..f8e3655 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs @@ -98,7 +98,7 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { session.Load(typeof(InventoryItemBase), LLUUID.Zero); } - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 491cb2a..e680840 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs @@ -91,7 +91,7 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { session.Load(typeof(UserProfileData), LLUUID.Zero); } - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); @@ -109,7 +109,8 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; } - } catch (Exception e) {} + // BUG: CATCHALL IS BAD. + } catch (Exception) {} return (user != null); } diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index f1694ca..1b577db 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -979,7 +979,7 @@ namespace OpenSim.Data.SQLite { Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID); } - catch (InvalidCastException e) + catch (InvalidCastException) { // Database table was created before we got here and now has null values :P try -- cgit v1.1