JIRA CANANOLAB-609 Allow empty cells for numeric column values in Fin…

…ding info Data and Conditions.
CBIIT · Jul 18, 2019 · deade08 · deade08
1 parent 9b7f87e
commit deade08
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/software/cananolab-webapp/src/gov/nih/nci/cananolab/dto/common/FindingBean.java b/software/cananolab-webapp/src/gov/nih/nci/cananolab/dto/common/FindingBean.java
@@ -391,7 +391,7 @@ public void setupDomain( String internalFileUriPath, String createdBy )
 
 
         // Test each cell for valid value here, so we can give a complete error list.
-        ArrayList<ArrayList<String>> errorDataArray = new ArrayList<>();
+        ArrayList<ArrayList<String>> errorDataArray = new ArrayList<ArrayList<String>>();
         boolean errorFlag = false;
         for( Row row : rows )
         {
@@ -404,7 +404,11 @@ public void setupDomain( String internalFileUriPath, String createdBy )
 
                     try
                     {
-                        Float errorTestFloat = Float.valueOf( cell.getValue() );
+                        // Don't reject an empty value.
+                        if( ( cell != null ) && (cell.getValue() != null ) && (cell.getValue().length() > 0 ) )
+                        {
+                            Float errorTestFloat = Float.valueOf( cell.getValue() );
+                        }
                     }
                     catch( NumberFormatException e )
                     {