summaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2015-11-26 16:14:19 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2015-11-26 16:14:19 +0000
commitae716b343e2e93091f28ddda1de8dfc57a5d5c65 (patch)
tree86d1cecf588371643c50b228853393d977c97e26 /src/java
parentaf7346a42aa8df310f2ce4fd913de82e99617107 (diff)
downloadxmlgraphics-fop-ae716b343e2e93091f28ddda1de8dfc57a5d5c65.tar.gz
xmlgraphics-fop-ae716b343e2e93091f28ddda1de8dfc57a5d5c65.zip
FOP-2455 - Fix unnecessary duplication of AFP resource objects as suggested by sdridi@iptech-group.com.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1716732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/afp/AFPResourceInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/afp/AFPResourceInfo.java b/src/java/org/apache/fop/afp/AFPResourceInfo.java
index d668a82af..b70207b44 100644
--- a/src/java/org/apache/fop/afp/AFPResourceInfo.java
+++ b/src/java/org/apache/fop/afp/AFPResourceInfo.java
@@ -159,7 +159,7 @@ public class AFPResourceInfo {
AFPResourceInfo ri = (AFPResourceInfo)obj;
return (uri != null && uri.equals(ri.uri))
- && (imageDimension != null && imageDimension.equals(ri.imageDimension))
+ && (imageDimension == ri.imageDimension || imageDimension != null && imageDimension.equals(ri.imageDimension))
&& (name != null && name.equals(ri.name))
&& (level != null && level.equals(ri.level));
}