LanguageFallbackItemSwitcher context lost when computed index fields …

…are added in parallel (For SolrProvider)
SitecoreSupport · Aug 7, 2017 · ebdafe1 · ebdafe1
1 parent b7e2c2c
commit ebdafe1
Showing 1 changed file with 40 additions and 37 deletions.
diff --git a/src/Sitecore.Support.96931/ContentSearch/SolrProvider/SolrDocumentBuilder.cs b/src/Sitecore.Support.96931/ContentSearch/SolrProvider/SolrDocumentBuilder.cs
@@ -11,51 +11,54 @@
 
 namespace Sitecore.Support.ContentSearch.SolrProvider
 {
-  public class SolrDocumentBuilder : Sitecore.ContentSearch.SolrProvider.SolrDocumentBuilder
-  {
-    private static readonly MethodInfo AddComputedIndexFieldMethodInfo;
-    static SolrDocumentBuilder()
+    public class SolrDocumentBuilder : Sitecore.ContentSearch.SolrProvider.SolrDocumentBuilder
     {
-      AddComputedIndexFieldMethodInfo = typeof(Sitecore.ContentSearch.SolrProvider.SolrDocumentBuilder).GetMethod("AddComputedIndexField", BindingFlags.Instance | BindingFlags.NonPublic);
-    }
-    public SolrDocumentBuilder(IIndexable indexable, IProviderUpdateContext context) : base(indexable, context)
-    {
-    }
-    private void AddComputedIndexField(IComputedIndexField computedIndexField, ParallelLoopState parallelLoopState = null, ConcurrentQueue<Exception> exceptions = null)
-    {
-      AddComputedIndexFieldMethodInfo.Invoke(this, new object[]
-      {
+        private static readonly MethodInfo AddComputedIndexFieldMethodInfo;
+        static SolrDocumentBuilder()
+        {
+            AddComputedIndexFieldMethodInfo = typeof(Sitecore.ContentSearch.SolrProvider.SolrDocumentBuilder).GetMethod("AddComputedIndexField", BindingFlags.Instance | BindingFlags.NonPublic);
+        }
+        public SolrDocumentBuilder(IIndexable indexable, IProviderUpdateContext context) : base(indexable, context)
+        {
+        }
+        private void AddComputedIndexField(IComputedIndexField computedIndexField, ParallelLoopState parallelLoopState = null, ConcurrentQueue<Exception> exceptions = null)
+        {
+            AddComputedIndexFieldMethodInfo.Invoke(this, new object[]
+            {
                 computedIndexField, parallelLoopState, exceptions
-      });
-    }
+            });
+        }
 
-    protected override void AddComputedIndexFieldsInParallel()
-    {
-      ConcurrentQueue<Exception> exceptions = new ConcurrentQueue<Exception>();
-      this.ParallelForeachProxy.ForEach<IComputedIndexField>((IEnumerable<IComputedIndexField>)base.Options.ComputedIndexFields, base.ParallelOptions,
+        protected override void AddComputedIndexFieldsInParallel()
+        {
+            ConcurrentQueue<Exception> exceptions = new ConcurrentQueue<Exception>();
+            var needEnterLanguageFallbackItemSwitcher = LanguageFallbackItemSwitcher.CurrentValue;
+            this.ParallelForeachProxy.ForEach<IComputedIndexField>((IEnumerable<IComputedIndexField>)base.Options.ComputedIndexFields, base.ParallelOptions,
         (Action<IComputedIndexField, ParallelLoopState>)((field, parallelLoopState) =>
         {
-          using (new LanguageFallbackFieldSwitcher(this.Index.EnableFieldLanguageFallback))
-          {
-            this.AddComputedIndexField(field, parallelLoopState, exceptions);
-          }
+            using (new LanguageFallbackItemSwitcher(needEnterLanguageFallbackItemSwitcher))
+            {
+                using (new LanguageFallbackFieldSwitcher(this.Index.EnableFieldLanguageFallback))
+                {
+                    this.AddComputedIndexField(field, parallelLoopState, exceptions);
+                }
+            }
         }));
-      if (!exceptions.IsEmpty)
-      {
-        throw new AggregateException(exceptions);
-      }
-    }
+            if (!exceptions.IsEmpty)
+            {
+                throw new AggregateException(exceptions);
+            }
+        }
 
-    protected override void AddComputedIndexFieldsInSequence()
-    {
-      foreach (IComputedIndexField field in base.Options.ComputedIndexFields)
-      {
-        using (new LanguageFallbackFieldSwitcher(this.Index.EnableFieldLanguageFallback))
+        protected override void AddComputedIndexFieldsInSequence()
         {
-          this.AddComputedIndexField(field, null, null);
+            foreach (IComputedIndexField field in base.Options.ComputedIndexFields)
+            {
+                using (new LanguageFallbackFieldSwitcher(this.Index.EnableFieldLanguageFallback))
+                {
+                    this.AddComputedIndexField(field, null, null);
+                }
+            }
         }
-      }
     }
-
-  }
 }