Merge pull request #47 from pub-comp/hotfix/aop-list-init

same change as in CacheAttribute init now in CacheListAttribute

Author: ybqwerty

AopCaching.UnitTests/AopMultiCacheTests.cs

@@ -28,6 +28,26 @@ public void TestInitialize()
             cache1.ClearAll();
         }
 
+        [TestMethod]
+        public void TestMultiMissingCache()
+        {
+            var service = new MultiService();
+            var results = service.GetItemsNoCache(new[] { "k1" });
+            Assert.AreEqual("1", results.First().Value);
+            results = service.GetItemsNoCache(new[] { "k1" });
+            Assert.AreEqual("2", results.First().Value);
+        }
+
+        [TestMethod]
+        public async Task TestMultiMissingCacheAsync()
+        {
+            var service = new MultiService();
+            var results = await service.GetItemsNoCacheAsync(new[] { "k1" });
+            Assert.AreEqual("1", results.First().Value);
+            results = await service.GetItemsNoCacheAsync(new[] { "k1" });
+            Assert.AreEqual("2", results.First().Value);
+        }
+
         [TestMethod]
         public void TestMultiCacheWith1Items()
         {

AopCaching.UnitTests/Mocks/MultiService.cs

@@ -7,6 +7,23 @@ namespace PubComp.Caching.AopCaching.UnitTests.Mocks
 {
     public class MultiService
     {
+        private int getItemsNoCacheCounter;
+
+        [CacheList("CacheMissing", typeof(MockDataKeyConverter))]
+        public IList<MockData> GetItemsNoCache(IList<string> keys)
+        {
+            ++getItemsNoCacheCounter;
+            return new List<MockData> { new MockData { Id = keys.FirstOrDefault(), Value = getItemsNoCacheCounter.ToString() } };
+        }
+
+        [CacheList("CacheMissing", typeof(MockDataKeyConverter))]
+        public async Task<IList<MockData>> GetItemsNoCacheAsync(IList<string> keys)
+        {
+            ++getItemsNoCacheCounter;
+            await Task.Delay(10);
+            return new List<MockData> { new MockData { Id = keys.FirstOrDefault(), Value = getItemsNoCacheCounter.ToString() } };
+        }
+
         [CacheList(typeof(MockDataKeyConverter))]
         public IList<MockData> GetItems(IList<string> keys)
         {

AopCaching/AopCaching.csproj

@@ -5,9 +5,9 @@
     <AssemblyName>PubComp.Caching.AopCaching</AssemblyName>
     <RootNamespace>PubComp.Caching.AopCaching</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>5.0.1</Version>
+    <Version>5.0.2</Version>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
-    <FileVersion>5.0.1.0</FileVersion>
+    <FileVersion>5.0.2.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;1591</NoWarn>

AopCaching/CacheListAttribute.cs

@@ -8,6 +8,7 @@
 using System.Collections;
 using System.Threading.Tasks;
 using PubComp.Caching.Core.Attributes;
+using NLog;
 
 namespace PubComp.Caching.AopCaching
 {
@@ -16,7 +17,6 @@ public class CacheListAttribute : MethodInterceptionAspect
     {
         private string cacheName;
         private ICache cache;
-        private long initialized = 0L;
         private string className;
         private string methodName;
         private string[] parameterTypeNames;
@@ -206,10 +206,13 @@ public sealed override void CompileTimeInitialize(MethodBase method, AspectInfo
 
         public sealed override void OnInvoke(MethodInterceptionArgs args)
         {
-            if (Interlocked.Read(ref initialized) == 0L)
+            if (this.cache == null)
             {
                 this.cache = CacheManager.GetCache(this.cacheName);
-                Interlocked.Exchange(ref initialized, 1L);
+                if (this.cache == null)
+                {
+                    LogManager.GetCurrentClassLogger().Warn($"AOP cache list [{this.cacheName}] is not initialized, define NoCache if needed!");
+                }
             }
 
             var cacheToUse = this.cache;
@@ -280,10 +283,13 @@ public sealed override void OnInvoke(MethodInterceptionArgs args)
 
         public sealed override async Task OnInvokeAsync(MethodInterceptionArgs args)
         {
-            if (Interlocked.Read(ref initialized) == 0L)
+            if (this.cache == null)
             {
                 this.cache = CacheManager.GetCache(this.cacheName);
-                Interlocked.Exchange(ref initialized, 1L);
+                if (this.cache == null)
+                {
+                    LogManager.GetCurrentClassLogger().Warn($"AOP cache list [{this.cacheName}] is not initialized, define NoCache if needed!");
+                }
             }
 
             var cacheToUse = this.cache;