moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix TestTextPieceTable test: fix PieceDescriptor.equals() method

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1145530 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-07-12 10:34:58 +00:00
parent 83c757f1cb
commit ce367bc274
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
View File

@ -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;