diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index ca1de5a839..6e9e085187 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Data
public abstract void CreateAsset(AssetBase asset);
public abstract void UpdateAsset(AssetBase asset);
public abstract bool ExistsAsset(LLUUID uuid);
- public abstract void CommitAssets();
public abstract string Version { get; }
public abstract string Name { get; }
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 3f2e8a75c9..108ceb19ee 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -203,13 +203,6 @@ namespace OpenSim.Data.MSSQL
return false;
}
- ///
- /// All writes are immediately commited to the database, so this is a no-op
- ///
- override public void CommitAssets()
- {
- }
-
#endregion
#region IPlugin Members
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 35572432bd..6cb0b4cf9a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -304,13 +304,6 @@ namespace OpenSim.Data.MySQL
return assetExists;
}
- ///
- /// All writes are immediately commited to the database, so this is a no-op
- ///
- override public void CommitAssets()
- {
- }
-
#endregion
///
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 174667e40e..eb4e14cdb9 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -161,12 +161,6 @@ namespace OpenSim.Data.NHibernate
}
- override public void CommitAssets() // force a sync to the database
- {
- m_log.Info("[SQLITE]: Attempting commit");
- }
-
-
public override string Name {
get { return "NHibernate"; }
}
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 8fa09fc015..dde05bd55d 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -223,19 +223,6 @@ namespace OpenSim.Data.SQLite
}
}
- ///
- /// commit
- ///
- override public void CommitAssets() // force a sync to the database
- {
- m_log.Info("[ASSET DB]: Attempting commit");
- // lock (ds)
- // {
- // da.Update(ds, "assets");
- // ds.AcceptChanges();
- // }
- }
-
/***********************************************************************
*
* Database Definition Functions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 74b19762a9..f65b88f95a 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Framework.Communications.Cache
protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
protected abstract void StoreAsset(AssetBase asset);
- protected abstract void CommitAssets();
///
/// This method must be implemented by a subclass to retrieve the asset named in the
@@ -108,8 +107,6 @@ namespace OpenSim.Framework.Communications.Cache
m_log.Info("[ASSET SERVER]: Setting up asset database");
assetLoader.ForEachDefaultXmlAsset(StoreAsset);
-
- CommitAssets();
}
public AssetServerBase()
@@ -167,7 +164,6 @@ namespace OpenSim.Framework.Communications.Cache
lock (m_syncLock)
{
m_assetProvider.UpdateAsset(asset);
- m_assetProvider.CommitAssets();
}
}
@@ -176,7 +172,6 @@ namespace OpenSim.Framework.Communications.Cache
lock (m_syncLock)
{
StoreAsset(asset);
- CommitAssets();
}
}
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 778780581f..6caabcd640 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -106,10 +106,6 @@ namespace OpenSim.Framework.Communications.Cache
}
}
- protected override void CommitAssets()
- {
- }
-
public override void Close()
{
throw new Exception("The method or operation is not implemented.");
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 334c5bd48d..95696eea1d 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -74,8 +74,6 @@ namespace OpenSim.Framework.Communications.Cache
public override void Close()
{
base.Close();
-
- m_assetProvider.CommitAssets();
}
protected override AssetBase GetAsset(AssetRequest req)
@@ -93,10 +91,5 @@ namespace OpenSim.Framework.Communications.Cache
{
m_assetProvider.CreateAsset(asset);
}
-
- protected override void CommitAssets()
- {
- m_assetProvider.CommitAssets();
- }
}
}
diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
index dcb79ea6f1..a9d0e33a36 100644
--- a/OpenSim/Framework/IAssetProvider.cs
+++ b/OpenSim/Framework/IAssetProvider.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Framework
void CreateAsset(AssetBase asset);
void UpdateAsset(AssetBase asset);
bool ExistsAsset(LLUUID uuid);
- void CommitAssets(); // force a sync to the database
void Initialise(string connect);
}
}
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 98f86f168e..372f5f8946 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -136,9 +136,8 @@ namespace OpenSim.Grid.AssetServer
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
AssetBase asset = (AssetBase) xs.Deserialize(request);
- m_log.InfoFormat("[REST]: StoreAndCommitAsset {0}", asset.FullID);
+ m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
m_assetProvider.CreateAsset(asset);
- m_assetProvider.CommitAssets();
return new byte[] {};
}