From f845c5281c9eb05614d283714b072bdac2ad93ef Mon Sep 17 00:00:00 2001 From: Sergey Vladimirov Date: Tue, 12 Jul 2011 10:34:58 +0000 Subject: [PATCH] fix TestTextPieceTable test: fix PieceDescriptor.equals() method git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1145530 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/apache/poi/hwpf/model/PieceDescriptor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java index c154f1da8d..52ae78ffd7 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java @@ -108,7 +108,7 @@ public final class PieceDescriptor final int prime = 31; int result = 1; result = prime * result + descriptor; - result = prime * result + prm.getValue(); + result = prime * result + ( ( prm == null ) ? 0 : prm.hashCode() ); result = prime * result + ( unicode ? 1231 : 1237 ); return result; } @@ -125,7 +125,12 @@ public final class PieceDescriptor PieceDescriptor other = (PieceDescriptor) obj; if ( descriptor != other.descriptor ) return false; - if ( prm != other.prm ) + if ( prm == null ) + { + if ( other.prm != null ) + return false; + } + else if ( !prm.equals( other.prm ) ) return false; if ( unicode != other.unicode ) return false; -- 2.39.5