From 9a2fdbd4730987818cafb42f9e92c0a40c91934c Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor@apache.org>
Date: Tue, 9 Nov 2010 15:02:31 +0000
Subject: [PATCH]  Tolerate Double.NaN when reading .xls files, see Bugzilla
 49761

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1033004 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/hssf/record/RecordInputStream.java       |   5 ++++-
 .../apache/poi/hssf/usermodel/TestHSSFCell.java  |   7 ++++++-
 test-data/spreadsheet/49761.xls                  | Bin 0 -> 4096 bytes
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 test-data/spreadsheet/49761.xls

diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/src/java/org/apache/poi/hssf/record/RecordInputStream.java
index 6a49ad283..8309f8843 100644
--- a/src/java/org/apache/poi/hssf/record/RecordInputStream.java
+++ b/src/java/org/apache/poi/hssf/record/RecordInputStream.java
@@ -273,7 +273,10 @@ public final class RecordInputStream implements LittleEndianInput {
 		long valueLongBits = readLong();
 		double result = Double.longBitsToDouble(valueLongBits);
 		if (Double.isNaN(result)) {
-			throw new RuntimeException("Did not expect to read NaN"); // (Because Excel typically doesn't write NaN
+            // YK: Excel doesn't write NaN but instead converts the cell type into CELL_TYPE_ERROR.
+            // HSSF prior to version 3.7 had a bug: it could write Double.NaN but could not read such a file back.
+            // This behavior was fixed in POI-3.7.
+            //throw new RuntimeException("Did not expect to read NaN"); // (Because Excel typically doesn't write NaN
 		}
 		return result;
 	}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
index 76f53c9c3..a943f3aef 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
@@ -321,5 +321,10 @@ public final class TestHSSFCell extends BaseTestCell {
 		}
 	}
 
-
+    /**
+     * HSSF prior to version 3.7 had a bug: it could write a NaN but could not read such a file back.
+     */
+    public void testReadNaN() {
+        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("49761.xls");
+    }
 }
diff --git a/test-data/spreadsheet/49761.xls b/test-data/spreadsheet/49761.xls
new file mode 100644
index 0000000000000000000000000000000000000000..948a0d11720cf5007849fcef69eaebe349383d1a
GIT binary patch
literal 4096
zcmeHK&1(};5dZBqX;NF$HvO`qvZj7CX)LV=l@?7EJc%Gm{lG|UX;4v&gd*srQ7d?`
zAb9ms@Z!afiyjndZ-RoN2f<VIKM)jpC|!RuyK6SJDHf}!^o5!C-tW!4nKy5CcJt<S
z{nYrQ)gLjZ^`Zi^b`>gpxZxY44hV8C*sN{avLvz`F1LRu0tb=fZx|N#;yn92F3DB?
zbZbV?@Qz!OAM@-m(SPIa=*UY$<R;w2IzsDtoW-E}adsZ9g`p_S@Ak!yg{6zDWB$Z0
z!iyf6)bP%~82gJhR7T-f?N^2QAXf(QuI^Q6H*H8*KElMqz$7{FiIm0#)Bwk_r*e5~
zU+(g`+(qkmw>|2^fFVBYWWwCxJc3sBiFZ!4LHPrfc;?6<iql5KNcTK%+d&DbPDjl?
zl^atYQyw8V@I-Y!DAJ84yr8^2a?4HPAa>`^44hlSg>`{7te7o8Y(uOq+1A#TiT9@4
zy-7O0F0h`_UsJMv{9tzIM5#~=A*?M5b#|5R!?|p=8DYfcO3m5L72S>mwgMS(C1H7<
zxzlvJ0_k|K3&gg>=y#^QFGDMxi1SBPzh1)fD<!NFjTDmTDK+Mtpwyna<};Z}6^(8~
z2fBSmJ^k-?J!Lgr)SN=2qy)a&mi7*tumqP&SNw~&v@kCDH=letTy~vL{(r^|SaLkK
zdGYLU;xIiIkC(xdW$;89yy^%1wi!TOp~9BFzEG)sv=Gp~p%Bs@1!&(`2-+vLE?j4|
zNy`TgpUFd~v)SRUn+PyZ4BR)g547+RbBhILIQE*&iW0^OPMz9Xho>uFg(h_;pxSh@
zP^3NW!z{WhwI<b&5204a_2l4ZRv0t)KEK^Rcp#NgJfV1p@~eszeAYMel&oX8!j;K@
z*lHqOQ|VFV<17pYt;ksnB1t3ZIx>}_DBD!ZKtES_CNrXlBOp9%@_oT((1tUpMTIL>
z>mZmOdC#bA(%CLEipTn{?Q>V9Tgx+6ICC!u5-|UZbb0(oA|T<HJd@jy%#oCr>k5%1
zr>jVEHPs}3129j)Cj-1c$xWc16eTr~yliXcnD05PBDIoMljJ|ba{K!tAot?Gf0=vq
M_j$YQ(Nag?8wLdPumAu6

literal 0
HcmV?d00001