Resolve Findbugs warning

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1856546 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/OptionalCharacterProperty.java b/fop-core/src/main/java/org/apache/fop/fo/properties/OptionalCharacterProperty.java
index 73c1f86263066b64f09b7852dc61732bd4c6d09a..2d67dbef0ff6344d6737fa644bc6271fe65cb1f9 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/OptionalCharacterProperty.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/OptionalCharacterProperty.java
@@ -101,9 +101,11 @@ public final class OptionalCharacterProperty extends Property {
     public boolean equals(Object obj) {
         if (obj instanceof OptionalCharacterProperty) {
             OptionalCharacterProperty ocp = (OptionalCharacterProperty) obj;
-            return character == ocp.character
-                   || character != null
-                      && character.equals(ocp.character);
+            if (character == null && ocp.character == null) {
+                return true;
+            } else {
+                return (character != null && character.equals(ocp.character));
+            }
         } else {
             return false;
         }

diff --git a/fop-core/src/tools/resources/findbugs/exclusions.xml b/fop-core/src/tools/resources/findbugs/exclusions.xml
index c78ba0577edf0fc774346f915f00801bbc9c01ed..facf7a4001b88b227723e0ee7a316b6e776a8316 100644 (file)
--- a/fop-core/src/tools/resources/findbugs/exclusions.xml
+++ b/fop-core/src/tools/resources/findbugs/exclusions.xml
@@ -413,6 +413,16 @@
       <Class name="org.apache.fop.servlet.FopServlet"/>
     </And>    
   </Match>
+  <!-- Bug in findbugs? -->
+  <Match>
+    <Bug pattern="RC_REF_COMPARISON"/>
+    <Or>
+      <And>
+        <Class name="org.apache.fop.fo.properties.OptionalCharacterProperty"/>
+        <Method name="equals"/>
+      </And>
+    </Or>
+  </Match>
   
   <!-- END - TEMPORARY (UNAPPROVED) EXCLUSIONS -->