BREAKING: Fix/virtual calls from constructors for cell (#808)

apache · Apr 8, 2023 · fdc6325 · fdc6325
1 parent ba80653
commit fdc6325
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Lucene.Net.Spatial/Prefix/Tree/Cell.cs b/src/Lucene.Net.Spatial/Prefix/Tree/Cell.cs
@@ -89,7 +89,8 @@ protected Cell(SpatialPrefixTree spatialPrefixTree, string token)
             if (token.Length > 0 && token[token.Length - 1] == (char)LEAF_BYTE)
             {
                 this.token = token.Substring(0, (token.Length - 1) - 0);
-                SetLeaf();
+                // LUCENENET specific - calling private instead of virtual to avoid initialization issues
+                SetLeafInternal(); 
             }
             if (Level == 0)
             {
@@ -157,7 +158,9 @@ private void B_fixLeaf()
             if (bytes![b_off + b_len - 1] == LEAF_BYTE)
             {
                 b_len--;
-                SetLeaf();
+                // LUCENENET specific - calling internal vs virtual
+                // to avoid issues when this is called from constructor
+                SetLeafInternal();
             }
             else
             {
@@ -175,7 +178,11 @@ private void B_fixLeaf()
         public virtual bool IsLeaf => m_leaf;
 
         /// <summary>Note: not supported at level 0.</summary>
-        public virtual void SetLeaf()
+        public virtual void SetLeaf() => SetLeafInternal();
+
+        // LUCENENET specific - S1699 - private method that can be called
+        // from constructor without causing initialization issues
+        private void SetLeafInternal()
         {
             if (Debugging.AssertsEnabled) Debugging.Assert(Level != 0);
             m_leaf = true;