- issue #68: don't stumble over invalid result sets

sbmlteam · May 30, 2020 · 189f21e · 189f21e
1 parent d9c986f
commit 189f21e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/test-runner/testsuite-core/src/org/sbml/testsuite/core/DelayedResult.java b/src/test-runner/testsuite-core/src/org/sbml/testsuite/core/DelayedResult.java
@@ -150,6 +150,7 @@ public ResultType call()
     public ResultType getResult()
     {
         if (isDone) return result;
+        if (worker == null) return result;
 
         try
         {

diff --git a/src/test-runner/testsuite-core/src/org/sbml/testsuite/core/data/ResultSet.java b/src/test-runner/testsuite-core/src/org/sbml/testsuite/core/data/ResultSet.java
@@ -463,6 +463,9 @@ else if (!file.canRead() || !file.isFile()) // Something's wrong.
         // have to keep testing the values themselves.
 
         int numRows = data.length;
+        if (numRows == 0 || data[0] == null)
+            return;
+
         int numColumns = data[0].length;
         for (int row = 0; row < numRows; row++)
             for (int col = 0; col < numColumns; col++)