7 files changed, 49 insertions, 41 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 3b67d6e..bb11e59 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -91,8 +91,9 @@ namespace OpenSim.Data.NHibernate
             {
                 user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
             }
-            catch (Exception)
+            catch (ObjectNotFoundException e) 
             {
+                user = null;
             }
 
             return (user != null);
@@ -102,8 +103,15 @@ namespace OpenSim.Data.NHibernate
         {
             UserProfileData user;
             // TODO: I'm sure I'll have to do something silly here
-            user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
-            user.CurrentAgent = GetAgentByUUID(uuid);
+            try 
+            {
+                user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
+                user.CurrentAgent = GetAgentByUUID(uuid);
+            } 
+            catch (ObjectNotFoundException e) 
+            {
+                user = null;
+            }
 
             return user;
         }
@@ -114,8 +122,6 @@ namespace OpenSim.Data.NHibernate
             {
                 session.Save(profile);
                 SetAgentData(profile.ID, profile.CurrentAgent);
-                // TODO: save agent
-                session.Transaction.Commit();
             }
             else
             {
@@ -132,12 +138,14 @@ namespace OpenSim.Data.NHibernate
             }
             else
             {
-                UserAgentData old = session.Load(typeof(UserAgentData), uuid) as UserAgentData;
-                if (old != null)
+                try 
                 {
+                    UserAgentData old = session.Load(typeof(UserAgentData), uuid) as UserAgentData;
                     session.Delete(old);
                 }
-                
+                catch (ObjectNotFoundException e) 
+                {
+                }
                 session.Save(agent);
             }
 
@@ -148,7 +156,6 @@ namespace OpenSim.Data.NHibernate
             {
                 session.Update(profile);
                 SetAgentData(profile.ID, profile.CurrentAgent);
-                session.Transaction.Commit();
                 return true;
             }
             else
@@ -161,23 +168,20 @@ namespace OpenSim.Data.NHibernate
 
         override public void AddNewUserAgent(UserAgentData agent)
         {
-            UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData;
-           
-            if (old == null)
+            try 
             {
-                session.Save(agent);
-                session.Transaction.Commit();
+                UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData;
+                session.Delete(old);
             }
-            else
+            catch (ObjectNotFoundException e) 
             {
-                UpdateUserAgent(agent);
             }
+            session.Save(agent);
         }
 
         public void UpdateUserAgent(UserAgentData agent)
         {
             session.Update(agent);
-            session.Transaction.Commit();
         }
 
         override public UserAgentData GetAgentByUUID(LLUUID uuid)
@@ -254,16 +258,22 @@ namespace OpenSim.Data.NHibernate
         {
             AvatarAppearance appearance;
             // TODO: I'm sure I'll have to do something silly here
-            appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance;
-
+            try {
+                appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance;
+            } catch (ObjectNotFoundException e) {
+                appearance = null;
+            }
             return appearance;
         }
 
         private bool ExistsAppearance(LLUUID uuid)
         {
             AvatarAppearance appearance;
-            
-            appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance;
+            try {
+                appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance;
+            } catch (ObjectNotFoundException e) {
+                appearance = null;
+            }
 
             return (appearance == null) ? false : true;
         }
@@ -271,19 +281,17 @@ namespace OpenSim.Data.NHibernate
 
         public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
         {
+            if (appearance == null) 
+                return;
+            
             bool exists = ExistsAppearance(user);
-
-            using (ITransaction transaction = session.BeginTransaction())
+            if (exists)
             {
-                if (exists)
-                {
-                    session.Update(appearance);
-                }
-                else
-                {
-                    session.Save(appearance);
-                }
-                transaction.Commit();
+                session.Update(appearance);
+            }
+            else
+            {
+                session.Save(appearance);
             }
         }
 
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index b853c0e..60fc146 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="true">
+    <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
         <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
index aa5ed35..6d918fe 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="true">
+    <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false">
         <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate">
             <generator class="assigned" /> 
         </id> 
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
index 3b76fa6..f1b4007 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="true">
+    <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false">
         <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
index 9100112..718cb98 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="true">
+    <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false">
         <id name="ProfileID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
index d857764..30f39ef 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-  <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="true">
+  <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false">
     <id name="Owner" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
       <generator class="assigned" /> 
     </id>
@@ -30,8 +30,8 @@
     <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
     <property name="SkirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />    
     <property name="SkirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-    <property name="Texture" type="binary" />
-    <property name="VisualParams" type="binary" />
-    <property name="Serial" type="int" />
+    <property name="Texture" type="Binary" />
+    <property name="VisualParams" type="Binary" />
+    <property name="Serial" type="Int32" />
   </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
index 925465a..4003628 100644
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="true">
+    <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false">
         <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id>