diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2015-11-26 16:53:00 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2015-11-26 16:53:00 +0000 |
| commit | ebe63dcaf2b25e1da7101ff1a8af046605af1c50 (patch) | |
| tree | e43629de22ef48c115252d505b8ee20c3d793a12 /src/java | |
| parent | ae716b343e2e93091f28ddda1de8dfc57a5d5c65 (diff) | |
| download | xmlgraphics-fop-ebe63dcaf2b25e1da7101ff1a8af046605af1c50.tar.gz xmlgraphics-fop-ebe63dcaf2b25e1da7101ff1a8af046605af1c50.zip | |
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
Diffstat (limited to 'src/java')
| -rw-r--r-- | src/java/org/apache/fop/afp/AFPResourceInfo.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/afp/AFPResourceInfo.java b/src/java/org/apache/fop/afp/AFPResourceInfo.java index b70207b44..39c270054 100644 --- 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} */ |