fix TestTextPieceTable test: fix PieceDescriptor.equals() method

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1145530 13f79535-47bb-0310-9956-ffa450edef68

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 c154f1da8d8da4cfd870368de4497639bd962d26..52ae78ffd750b15b24bb847078a3547fa1bdb3cb 100644 (file)
--- 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;