PdfNumber equals and hashcode fixes

DEVSIX-4931

Autoported commit.
Original commit hash: [f370fe48b]

Author: BezrukovM

itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfPrimitivesTest.cs

@@ -253,16 +253,33 @@ public virtual void EqualStrings() {
         }
 
         [NUnit.Framework.Test]
-        [LogMessage(iText.IO.LogMessageConstant.CALCULATE_HASHCODE_FOR_MODIFIED_PDFNUMBER)]
         public virtual void EqualNumbers() {
-            PdfNumber num1 = (PdfNumber)new PdfNumber(1).MakeIndirect(new PdfDocument(new PdfWriter(new ByteArrayOutputStream
-                ())));
-            PdfNumber num2 = new PdfNumber(2);
-            NUnit.Framework.Assert.IsFalse(num1.Equals(num2));
-            int hashCode = num1.GetHashCode();
-            num1.Increment();
-            NUnit.Framework.Assert.IsTrue(num1.Equals(num2));
-            NUnit.Framework.Assert.AreNotEqual(hashCode, num1.GetHashCode());
+            using (PdfDocument document = new PdfDocument(new PdfWriter(new ByteArrayOutputStream()))) {
+                // add a page to avoid exception throwing on close
+                document.AddNewPage();
+                PdfNumber num1 = (PdfNumber)new PdfNumber(1).MakeIndirect(document);
+                PdfNumber num2 = new PdfNumber(2);
+                NUnit.Framework.Assert.IsFalse(num1.Equals(num2));
+                int hashCode = num1.GetHashCode();
+                num1.Increment();
+                NUnit.Framework.Assert.IsTrue(num1.Equals(num2));
+                NUnit.Framework.Assert.AreNotEqual(hashCode, num1.GetHashCode());
+            }
+            PdfNumber a = new PdfNumber(1);
+            PdfNumber aContent = new PdfNumber(a.GetInternalContent());
+            PdfNumber b = new PdfNumber(2);
+            PdfNumber bContent = new PdfNumber(b.GetInternalContent());
+            NUnit.Framework.Assert.IsTrue(a.Equals(aContent));
+            NUnit.Framework.Assert.AreEqual(a.GetHashCode(), aContent.GetHashCode());
+            NUnit.Framework.Assert.IsTrue(b.Equals(bContent));
+            NUnit.Framework.Assert.AreEqual(b.GetHashCode(), bContent.GetHashCode());
+            NUnit.Framework.Assert.IsFalse(aContent.Equals(bContent));
+            NUnit.Framework.Assert.AreNotEqual(aContent.GetHashCode(), bContent.GetHashCode());
+            aContent.Increment();
+            NUnit.Framework.Assert.IsFalse(a.Equals(aContent));
+            NUnit.Framework.Assert.AreNotEqual(a.GetHashCode(), aContent.GetHashCode());
+            NUnit.Framework.Assert.IsTrue(aContent.Equals(bContent));
+            NUnit.Framework.Assert.AreEqual(aContent.GetHashCode(), bContent.GetHashCode());
         }
 
         [NUnit.Framework.Test]

itext/itext.io/itext/io/LogMessageConstant.cs

@@ -60,6 +60,8 @@ public sealed class LogMessageConstant {
 
         public const String ATTEMPT_TO_MOVE_TO_FLUSHED_PARENT = "An attempt is made to move the tag tree pointer to the tag parent which has been already flushed. Tag tree pointer is moved to the root tag instead.";
 
+        /// <summary>The log message for hashcode method call for modified instance of PdfNumber object.</summary>
+        [System.ObsoleteAttribute(@"Logging this case has been deprecated The constant will be removed in 7.2.")]
         public const String CALCULATE_HASHCODE_FOR_MODIFIED_PDFNUMBER = "Calculate hashcode for modified PdfNumber.";
 
         public const String CANNOT_ADD_FINISHED_HINT_AS_A_NEW_KID_HINT = "Layout tagging hints addition failed: cannot add a hint that is already marked as finished. Consider using com.itextpdf.layout.tagging.LayoutTaggingHelper#moveKidHint method for moving already finished kid hint from not yet finished parent hint.";

itext/itext.kernel/itext/kernel/pdf/PdfNumber.cs

@@ -42,7 +42,6 @@ source product.
 address: [email protected]
 */
 using System;
-using Common.Logging;
 using iText.IO.Source;
 using iText.IO.Util;
 
@@ -52,8 +51,6 @@ public class PdfNumber : PdfPrimitiveObject {
 
         private bool isDouble;
 
-        private bool changed = false;
-
         public PdfNumber(double value)
             : base() {
             SetValue(value);
@@ -105,7 +102,6 @@ public virtual void SetValue(int value) {
             this.value = value;
             this.isDouble = false;
             this.content = null;
-            this.changed = true;
         }
 
         public virtual void SetValue(double value) {
@@ -139,8 +135,13 @@ public override String ToString() {
         }
 
         public override bool Equals(Object o) {
-            return this == o || o != null && GetType() == o.GetType() && JavaUtil.DoubleCompare(((iText.Kernel.Pdf.PdfNumber
-                )o).value, value) == 0;
+            if (this == o) {
+                return true;
+            }
+            if (o == null || GetType() != o.GetType()) {
+                return false;
+            }
+            return JavaUtil.DoubleCompare(((iText.Kernel.Pdf.PdfNumber)o).GetValue(), GetValue()) == 0;
         }
 
         /// <summary>Checks if string representation of the value contains decimal point.</summary>
@@ -150,13 +151,7 @@ public virtual bool HasDecimalPoint() {
         }
 
         public override int GetHashCode() {
-            if (changed) {
-                //if the instance was modified, hashCode also will be changed, it may cause inconsistency.
-                ILog logger = LogManager.GetLogger(typeof(PdfReader));
-                logger.Warn(iText.IO.LogMessageConstant.CALCULATE_HASHCODE_FOR_MODIFIED_PDFNUMBER);
-                changed = false;
-            }
-            long hash = JavaUtil.DoubleToLongBits(value);
+            long hash = JavaUtil.DoubleToLongBits(GetValue());
             return (int)(hash ^ ((long)(((ulong)hash) >> 32)));
         }
 

port-hash

@@ -1 +1 @@
-f1732a245a993f40926832877c8639bbd0ff93b2
+f370fe48b878c1deb322a836e3060530e1ee380c