You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2020/12/10 12:24:19 UTC
svn commit: r1884278 -
/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
Author: fanningpj
Date: Thu Dec 10 12:24:19 2020
New Revision: 1884278
URL: http://svn.apache.org/viewvc?rev=1884278&view=rev
Log:
try to handle case where checksum is null
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java?rev=1884278&r1=1884277&r2=1884278&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java Thu Dec 10 12:24:19 2020
@@ -124,7 +124,7 @@ public class XWPFPictureData extends POI
/**
* Return an integer constant that specifies type of this picture
*
- * @return an integer constant that specifies type of this picture
+ * @return an integer constant that specifies type of this picture, returns 0 if an unknown type
* @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_EMF
* @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_WMF
* @see org.apache.poi.xwpf.usermodel.Document#PICTURE_TYPE_PICT
@@ -217,15 +217,22 @@ public class XWPFPictureData extends POI
Long foreignChecksum = picData.getChecksum();
Long localChecksum = getChecksum();
- if (!(localChecksum.equals(foreignChecksum))) {
- return false;
+ if (localChecksum == null) {
+ if (foreignChecksum != null) {
+ return false;
+ }
+ } else {
+ if (!(localChecksum.equals(foreignChecksum))) {
+ return false;
+ }
}
return Arrays.equals(this.getData(), picData.getData());
}
@Override
public int hashCode() {
- return getChecksum().hashCode();
+ Long checksum = getChecksum();
+ return checksum == null ? super.hashCode() : checksum.hashCode();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org