FOP-2455b - Applied updated patch in addition to the original one (see: r1716732)

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

diff --git a/src/java/org/apache/fop/afp/AFPResourceInfo.java b/src/java/org/apache/fop/afp/AFPResourceInfo.java
index b70207b4432f4d6cfe8d62b3e4ec518937e1865b..39c2700544acc8b1eed2bcd413064a581779f406 100644 (file)
--- a/src/java/org/apache/fop/afp/AFPResourceInfo.java
+++ b/src/java/org/apache/fop/afp/AFPResourceInfo.java
@@ -158,10 +158,10 @@ public class AFPResourceInfo {
         }
 
         AFPResourceInfo ri = (AFPResourceInfo)obj;
-        return (uri != null && uri.equals(ri.uri))
-            && (imageDimension == ri.imageDimension || imageDimension != null && imageDimension.equals(ri.imageDimension))
-            && (name != null && name.equals(ri.name))
-            && (level != null && level.equals(ri.level));
+        return (uri == ri.uri || uri != null && uri.equals(ri.uri))
+                && (imageDimension == ri.imageDimension ||imageDimension != null && imageDimension.equals(ri.imageDimension))
+                && (name == ri.name ||name != null && name.equals(ri.name))
+                && (level == ri.level ||level != null && level.equals(ri.level));
     }
 
     /** {@inheritDoc} */