Fixes #238

techascent · May 5, 2021 · 7fce058 · 7fce058
1 parent 318162b
commit 7fce058
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 6.00-beta-8
+ * Fix for [issue 238](https://github.com/techascent/tech.ml.dataset/issues/238)
+
 ## 6.00-beta-7
  * Final upgrade for geni benchmark and moved a utility function to make
    it more generally accessible.

diff --git a/project.clj b/project.clj
@@ -10,7 +10,7 @@
                  [com.univocity/univocity-parsers  "2.9.0"]
                  [org.apache.poi/poi-ooxml         "4.1.2"
                   :exclusions [commons-codec]]
-                 [org.dhatim/fastexcel-reader      "0.10.12"
+                 [org.dhatim/fastexcel-reader      "0.12.8"
                   :exclusions [org.apache.poi/poi-ooxml]]
                  [com.github.haifengl/smile-core   "2.6.0"
                   :exclusions [org.slf4j/slf4j-api]]

diff --git a/src/tech/v3/libs/fastexcel.clj b/src/tech/v3/libs/fastexcel.clj
@@ -82,7 +82,9 @@
                                 (test [this val] (not= val nil))))
                      (.iterator))]
         (reify java.util.Iterator
-          (hasNext [this] (.hasNext iter))
+          ;;In some cases hasNext throws.
+          (hasNext [this] (try (.hasNext iter)
+                               (catch Exception e false)))
           (next [this] (wrap-cell (.next iter))))))))
 
 (defn- wrap-sheet