ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor asset handling as per Ubit's suggestion

Browse Source
This commit is contained in:
Melanie Thielker
2017-02-01 16:31:01 +00:00
parent 5ceb315e34
commit a5151bb337
12 changed files with 75 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
View File

@@ -209,10 +209,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache != null)
{
bool negative;
asset = m_Cache.Get(id, out negative);
if (negative)
if (!m_Cache.Get(id, out asset))
return null;
if (asset != null)
@@ -242,9 +239,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
public AssetBase GetCached(string id)
{
bool negative;
AssetBase asset = null;
if (m_Cache != null)
return m_Cache.Get(id, out negative);
m_Cache.Get(id, out asset);
return null;
}
@@ -255,10 +252,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache != null)
{
bool negative;
asset = m_Cache.Get(id, out negative);
if (negative)
if (!m_Cache.Get(id, out asset))
return null;
if (asset != null)
@@ -281,10 +275,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache != null)
{
bool negative;
asset = m_Cache.Get(id, out negative);
if (negative)
if (!m_Cache.Get(id, out asset))
return null;
if (asset != null)
@@ -304,10 +295,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache != null)
{
bool negative;
asset = m_Cache.Get(id, out negative);
if (negative)
if (!m_Cache.Get(id, out asset))
return false;
}
@@ -398,9 +386,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
{
AssetBase asset = null;
bool negative;
if (m_Cache != null)
asset = m_Cache.Get(id, out negative);
m_Cache.Get(id, out asset);
if (asset != null)
{

17
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
View File

@@ -159,10 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
AssetBase asset = null;
if (m_Cache != null)
{
bool negative;
asset = m_Cache.Get(id, out negative);
if (negative)
if (!m_Cache.Get(id, out asset))
return null;
}
@@ -183,13 +180,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
{
// m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Cache request for {0}", id);
AssetBase asset = null;
if (m_Cache != null)
{
bool negative;
return m_Cache.Get(id, out negative);
}
m_Cache.Get(id, out asset);
return null;
return asset;
}
public AssetMetadata GetMetadata(string id)
@@ -197,9 +192,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
AssetBase asset = null;
if (m_Cache != null)
{
bool negative;
asset = m_Cache.Get(id, out negative);
if (negative)
if (!m_Cache.Get(id, out asset))
return null;
}