diff options
author | Justin Clarke Casey | 2009-03-09 19:40:32 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-09 19:40:32 +0000 |
commit | ae759f2d060bc53cc0b372d5584fcd4ffdd963b4 (patch) | |
tree | 304c4c40fa8be68943a3b5cad0b22a19769b2cf9 /OpenSim/Framework/Communications/Cache | |
parent | * Move method documentation from AssetCache up to IAssetCache (diff) | |
download | opensim-SC-ae759f2d060bc53cc0b372d5584fcd4ffdd963b4.zip opensim-SC-ae759f2d060bc53cc0b372d5584fcd4ffdd963b4.tar.gz opensim-SC-ae759f2d060bc53cc0b372d5584fcd4ffdd963b4.tar.bz2 opensim-SC-ae759f2d060bc53cc0b372d5584fcd4ffdd963b4.tar.xz |
* Add basic asset cache get test
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/GridAssetClient.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 3b6dc52..7131cb5 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |||
@@ -36,7 +36,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
36 | { | 36 | { |
37 | public class GridAssetClient : AssetServerBase | 37 | public class GridAssetClient : AssetServerBase |
38 | { | 38 | { |
39 | |||
40 | #region IPlugin | 39 | #region IPlugin |
41 | 40 | ||
42 | public override string Name | 41 | public override string Name |
@@ -51,7 +50,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
51 | 50 | ||
52 | public override void Initialise(ConfigSettings p_set, string p_url) | 51 | public override void Initialise(ConfigSettings p_set, string p_url) |
53 | { | 52 | { |
54 | m_log.Debug("[GRIDASSET] Plugin configured initialisation"); | 53 | m_log.Debug("[GRID ASSET CLIENT]: Plugin configured initialisation"); |
55 | Initialise(p_url); | 54 | Initialise(p_url); |
56 | } | 55 | } |
57 | 56 | ||
@@ -65,7 +64,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
65 | 64 | ||
66 | public GridAssetClient(string p_url) | 65 | public GridAssetClient(string p_url) |
67 | { | 66 | { |
68 | m_log.Debug("[GRIDASSET] Direct constructor"); | 67 | m_log.Debug("[GRID ASSET CLIENT]: Direct constructor"); |
69 | Initialise(p_url); | 68 | Initialise(p_url); |
70 | } | 69 | } |
71 | 70 | ||
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 5274288..41a9561 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | |||
@@ -34,7 +34,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
34 | { | 34 | { |
35 | public class SQLAssetServer : AssetServerBase | 35 | public class SQLAssetServer : AssetServerBase |
36 | { | 36 | { |
37 | |||
38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | 38 | ||
40 | #region IPlugin | 39 | #region IPlugin |
@@ -51,7 +50,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
51 | 50 | ||
52 | public override void Initialise(ConfigSettings p_set) | 51 | public override void Initialise(ConfigSettings p_set) |
53 | { | 52 | { |
54 | m_log.Debug("[SQLASSET] Plugin configured initialisation"); | 53 | m_log.Debug("[SQLAssetServer]: Plugin configured initialisation"); |
55 | Initialise(p_set.StandaloneAssetPlugin,p_set.StandaloneAssetSource); | 54 | Initialise(p_set.StandaloneAssetPlugin,p_set.StandaloneAssetSource); |
56 | } | 55 | } |
57 | 56 | ||
@@ -61,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
61 | 60 | ||
62 | public SQLAssetServer(string pluginName, string connect) | 61 | public SQLAssetServer(string pluginName, string connect) |
63 | { | 62 | { |
64 | m_log.Debug("[SQLASSET] Direct constructor"); | 63 | m_log.Debug("[SQLAssetServer]: Direct constructor"); |
65 | Initialise(pluginName, connect); | 64 | Initialise(pluginName, connect); |
66 | } | 65 | } |
67 | 66 | ||
@@ -108,7 +107,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
108 | 107 | ||
109 | protected override AssetBase GetAsset(AssetRequest req) | 108 | protected override AssetBase GetAsset(AssetRequest req) |
110 | { | 109 | { |
111 | return m_assetProvider.FetchAsset(req.AssetID);; | 110 | return m_assetProvider.FetchAsset(req.AssetID); |
112 | } | 111 | } |
113 | 112 | ||
114 | public override void StoreAsset(AssetBase asset) | 113 | public override void StoreAsset(AssetBase asset) |