From bb62a7639a02787839f9eec1a3214bdf7fd2d4cc Mon Sep 17 00:00:00 2001
From: Glenn Adams <gadams@apache.org>
Date: Thu, 14 Jun 2012 19:33:41 +0000
Subject: Bugzilla #53412: Eliminate incorrect use of object identity which
 produces excessive property cache collisions. Submitted by Alexios Giotis.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1350379 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/fo/properties/CondLengthProperty.java | 5 +++--
 status.xml                                                    | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
index 07eec7361..19c8af1bb 100644
--- a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
+++ b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
@@ -26,6 +26,7 @@ import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.util.CompareUtil;
 
 /**
  * Superclass for properties that have conditional lengths
@@ -192,8 +193,8 @@ public class CondLengthProperty extends Property implements CompoundDatatype {
 
         if (obj instanceof CondLengthProperty) {
             CondLengthProperty clp = (CondLengthProperty)obj;
-            return (this.length == clp.length
-                    && this.conditionality == clp.conditionality);
+            return (CompareUtil.equal(this.length, clp.length)
+                    && CompareUtil.equal(this.conditionality, clp.conditionality));
         }
         return false;
     }
diff --git a/status.xml b/status.xml
index c632d3305..ba895efab 100644
--- a/status.xml
+++ b/status.xml
@@ -63,6 +63,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Code" dev="GA" type="fix" fixes-bug="53412" due-to="Alexios Giotis">
+        Eliminate incorrect use of object identity which produces excessive property cache collisions.
+      </action>
       <action context="Code" dev="GA" type="fix">
         Eliminate javadocs warnings.
       </action>
-- 
cgit v1.2.3