aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/AssetDataBase.cs1
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs7
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs7
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs6
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs13
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/SQLAssetServer.cs7
-rw-r--r--OpenSim/Framework/IAssetProvider.cs1
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs3
10 files changed, 1 insertions, 53 deletions
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index ca1de5a..6e9e085 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Data
36 public abstract void CreateAsset(AssetBase asset); 36 public abstract void CreateAsset(AssetBase asset);
37 public abstract void UpdateAsset(AssetBase asset); 37 public abstract void UpdateAsset(AssetBase asset);
38 public abstract bool ExistsAsset(LLUUID uuid); 38 public abstract bool ExistsAsset(LLUUID uuid);
39 public abstract void CommitAssets();
40 39
41 public abstract string Version { get; } 40 public abstract string Version { get; }
42 public abstract string Name { get; } 41 public abstract string Name { get; }
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 3f2e8a7..108ceb1 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -203,13 +203,6 @@ namespace OpenSim.Data.MSSQL
203 return false; 203 return false;
204 } 204 }
205 205
206 /// <summary>
207 /// All writes are immediately commited to the database, so this is a no-op
208 /// </summary>
209 override public void CommitAssets()
210 {
211 }
212
213 #endregion 206 #endregion
214 207
215 #region IPlugin Members 208 #region IPlugin Members
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 3557243..6cb0b4c 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -304,13 +304,6 @@ namespace OpenSim.Data.MySQL
304 return assetExists; 304 return assetExists;
305 } 305 }
306 306
307 /// <summary>
308 /// All writes are immediately commited to the database, so this is a no-op
309 /// </summary>
310 override public void CommitAssets()
311 {
312 }
313
314 #endregion 307 #endregion
315 308
316 /// <summary> 309 /// <summary>
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 174667e..eb4e14c 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -161,12 +161,6 @@ namespace OpenSim.Data.NHibernate
161 161
162 } 162 }
163 163
164 override public void CommitAssets() // force a sync to the database
165 {
166 m_log.Info("[SQLITE]: Attempting commit");
167 }
168
169
170 public override string Name { 164 public override string Name {
171 get { return "NHibernate"; } 165 get { return "NHibernate"; }
172 } 166 }
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 8fa09fc..dde05bd 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -223,19 +223,6 @@ namespace OpenSim.Data.SQLite
223 } 223 }
224 } 224 }
225 225
226 /// <summary>
227 /// commit
228 /// </summary>
229 override public void CommitAssets() // force a sync to the database
230 {
231 m_log.Info("[ASSET DB]: Attempting commit");
232 // lock (ds)
233 // {
234 // da.Update(ds, "assets");
235 // ds.AcceptChanges();
236 // }
237 }
238
239 /*********************************************************************** 226 /***********************************************************************
240 * 227 *
241 * Database Definition Functions 228 * Database Definition Functions
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index 74b1976..f65b88f 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Framework.Communications.Cache
50 protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); 50 protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
51 51
52 protected abstract void StoreAsset(AssetBase asset); 52 protected abstract void StoreAsset(AssetBase asset);
53 protected abstract void CommitAssets();
54 53
55 /// <summary> 54 /// <summary>
56 /// This method must be implemented by a subclass to retrieve the asset named in the 55 /// This method must be implemented by a subclass to retrieve the asset named in the
@@ -108,8 +107,6 @@ namespace OpenSim.Framework.Communications.Cache
108 m_log.Info("[ASSET SERVER]: Setting up asset database"); 107 m_log.Info("[ASSET SERVER]: Setting up asset database");
109 108
110 assetLoader.ForEachDefaultXmlAsset(StoreAsset); 109 assetLoader.ForEachDefaultXmlAsset(StoreAsset);
111
112 CommitAssets();
113 } 110 }
114 111
115 public AssetServerBase() 112 public AssetServerBase()
@@ -167,7 +164,6 @@ namespace OpenSim.Framework.Communications.Cache
167 lock (m_syncLock) 164 lock (m_syncLock)
168 { 165 {
169 m_assetProvider.UpdateAsset(asset); 166 m_assetProvider.UpdateAsset(asset);
170 m_assetProvider.CommitAssets();
171 } 167 }
172 } 168 }
173 169
@@ -176,7 +172,6 @@ namespace OpenSim.Framework.Communications.Cache
176 lock (m_syncLock) 172 lock (m_syncLock)
177 { 173 {
178 StoreAsset(asset); 174 StoreAsset(asset);
179 CommitAssets();
180 } 175 }
181 } 176 }
182 177
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 7787805..6caabcd 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -106,10 +106,6 @@ namespace OpenSim.Framework.Communications.Cache
106 } 106 }
107 } 107 }
108 108
109 protected override void CommitAssets()
110 {
111 }
112
113 public override void Close() 109 public override void Close()
114 { 110 {
115 throw new Exception("The method or operation is not implemented."); 111 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 334c5bd..95696ee 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -74,8 +74,6 @@ namespace OpenSim.Framework.Communications.Cache
74 public override void Close() 74 public override void Close()
75 { 75 {
76 base.Close(); 76 base.Close();
77
78 m_assetProvider.CommitAssets();
79 } 77 }
80 78
81 protected override AssetBase GetAsset(AssetRequest req) 79 protected override AssetBase GetAsset(AssetRequest req)
@@ -93,10 +91,5 @@ namespace OpenSim.Framework.Communications.Cache
93 { 91 {
94 m_assetProvider.CreateAsset(asset); 92 m_assetProvider.CreateAsset(asset);
95 } 93 }
96
97 protected override void CommitAssets()
98 {
99 m_assetProvider.CommitAssets();
100 }
101 } 94 }
102} 95}
diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
index dcb79ea..a9d0e33 100644
--- a/OpenSim/Framework/IAssetProvider.cs
+++ b/OpenSim/Framework/IAssetProvider.cs
@@ -35,7 +35,6 @@ namespace OpenSim.Framework
35 void CreateAsset(AssetBase asset); 35 void CreateAsset(AssetBase asset);
36 void UpdateAsset(AssetBase asset); 36 void UpdateAsset(AssetBase asset);
37 bool ExistsAsset(LLUUID uuid); 37 bool ExistsAsset(LLUUID uuid);
38 void CommitAssets(); // force a sync to the database
39 void Initialise(string connect); 38 void Initialise(string connect);
40 } 39 }
41} 40}
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 98f86f1..372f5f8 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -136,9 +136,8 @@ namespace OpenSim.Grid.AssetServer
136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); 136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
137 AssetBase asset = (AssetBase) xs.Deserialize(request); 137 AssetBase asset = (AssetBase) xs.Deserialize(request);
138 138
139 m_log.InfoFormat("[REST]: StoreAndCommitAsset {0}", asset.FullID); 139 m_log.InfoFormat("[REST]: Creating asset {0}", asset.FullID);
140 m_assetProvider.CreateAsset(asset); 140 m_assetProvider.CreateAsset(asset);
141 m_assetProvider.CommitAssets();
142 141
143 return new byte[] {}; 142 return new byte[] {};
144 } 143 }