From 3bbb86658ef99f38973e1c6b0b4d08922f4700eb Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Sat, 7 Apr 2012 04:15:41 +0000 Subject: [PATCH] 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 --- src/java/org/apache/fop/afp/AFPResourceLevel.java | 2 +- status.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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. --> + + Correct coding error in AFPResourceLevel#equals. + Throw IFException instead of NPE if navigation target (page reference) doesn't exist. -- 2.39.5