diff options
| author | Glenn Adams <gadams@apache.org> | 2012-04-07 04:15:41 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-04-07 04:15:41 +0000 |
| commit | 3bbb86658ef99f38973e1c6b0b4d08922f4700eb (patch) | |
| tree | ef3732a5a515f6a24c99452c9aaca88a5d24297f | |
| parent | 82712c6d2d8fca7b78296be29dedf7627ca2ed50 (diff) | |
| download | xmlgraphics-fop-3bbb86658ef99f38973e1c6b0b4d08922f4700eb.tar.gz xmlgraphics-fop-3bbb86658ef99f38973e1c6b0b4d08922f4700eb.zip | |
Bugzilla #49350: Fix coding error in AFPResourceLevel#equals.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1310669 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/afp/AFPResourceLevel.java | 2 | ||||
| -rw-r--r-- | status.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/afp/AFPResourceLevel.java b/src/java/org/apache/fop/afp/AFPResourceLevel.java index 327a99bd5..d884b56a6 100644 --- a/src/java/org/apache/fop/afp/AFPResourceLevel.java +++ b/src/java/org/apache/fop/afp/AFPResourceLevel.java @@ -186,7 +186,7 @@ public class AFPResourceLevel { } AFPResourceLevel rl = (AFPResourceLevel)obj; - return (level == level) + return (level == rl.level) && (extFilePath == rl.extFilePath || extFilePath != null && extFilePath.equals(rl.extFilePath)); } diff --git a/status.xml b/status.xml index ef2fcc3de..28fef4011 100644 --- a/status.xml +++ b/status.xml @@ -62,6 +62,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="49350" due-to="Julien Aymé"> + Correct coding error in AFPResourceLevel#equals. + </action> <action context="Code" dev="GA" type="fix" fixes-bug="51836" due-to="Melanie Drake"> Throw IFException instead of NPE if navigation target (page reference) doesn't exist. </action> |