Update svn properties. Squash a couple of warnings.
parent
492b25362c
commit
186f83692c
|
@ -107,7 +107,7 @@ namespace OpenSim.Data.NHibernate
|
||||||
{
|
{
|
||||||
return session.Load(typeof(AssetBase), uuid) as AssetBase;
|
return session.Load(typeof(AssetBase), uuid) as AssetBase;
|
||||||
}
|
}
|
||||||
catch (ObjectNotFoundException e)
|
catch (ObjectNotFoundException)
|
||||||
{
|
{
|
||||||
m_log.ErrorFormat("[NHIBERNATE] no such asset {0}", uuid);
|
m_log.ErrorFormat("[NHIBERNATE] no such asset {0}", uuid);
|
||||||
return null;
|
return null;
|
||||||
|
@ -125,7 +125,7 @@ namespace OpenSim.Data.NHibernate
|
||||||
{
|
{
|
||||||
AssetBase a = session.Load(typeof(AssetBase), asset.FullID) as AssetBase;
|
AssetBase a = session.Load(typeof(AssetBase), asset.FullID) as AssetBase;
|
||||||
}
|
}
|
||||||
catch (ObjectNotFoundException e)
|
catch (ObjectNotFoundException)
|
||||||
{
|
{
|
||||||
session.Save(asset);
|
session.Save(asset);
|
||||||
session.Flush();
|
session.Flush();
|
||||||
|
|
|
@ -125,7 +125,7 @@ namespace OpenSim.Data.NHibernate
|
||||||
session.Update(p);
|
session.Update(p);
|
||||||
m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID);
|
m_log.InfoFormat("[NHIBERNATE] updating object {0}", p.UUID);
|
||||||
}
|
}
|
||||||
catch (ObjectNotFoundException e)
|
catch (ObjectNotFoundException)
|
||||||
{
|
{
|
||||||
m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID);
|
m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID);
|
||||||
session.Save(p);
|
session.Save(p);
|
||||||
|
@ -145,7 +145,7 @@ namespace OpenSim.Data.NHibernate
|
||||||
session.Update(t);
|
session.Update(t);
|
||||||
session.Flush();
|
session.Flush();
|
||||||
}
|
}
|
||||||
catch (ObjectNotFoundException e)
|
catch (ObjectNotFoundException)
|
||||||
{
|
{
|
||||||
session.Save(t);
|
session.Save(t);
|
||||||
session.Flush();
|
session.Flush();
|
||||||
|
|
Loading…
Reference in New Issue