Merge pull request #1578 from dimagi/jt/EoF-error-handling-fix

Log instead of blocking app for EoF errors

Author: Jtang-1

src/main/java/org/commcare/formplayer/services/MenuSessionFactory.java

@@ -115,7 +115,7 @@ public void rebuildSessionFromFrame(MenuSession menuSession, CaseSearchHelper ca
                     }
                 }
                 if (currentStep == null && processedStepsCount != steps.size()) {
-                    checkAndThrowCommandIDMatchError(steps, processedSteps, options);
+                    checkAndLogCommandIDMatchError(steps, processedSteps, options);
                 }
             } else if (screen instanceof EntityScreen) {
                 EntityScreen entityScreen = (EntityScreen)screen;
@@ -247,7 +247,7 @@ private MenuSession performInstall(InstallRequestBean bean) throws Exception {
         );
     }
 
-    private void checkAndThrowCommandIDMatchError(Vector<StackFrameStep> steps, List<StackFrameStep> processedSteps,
+    private void checkAndLogCommandIDMatchError(Vector<StackFrameStep> steps, List<StackFrameStep> processedSteps,
         MenuDisplayable[] options) throws CommCareSessionException {
         Vector<StackFrameStep> unprocessedSteps = new Vector<>();
         for (StackFrameStep step : steps) {
@@ -266,7 +266,7 @@ private void checkAndThrowCommandIDMatchError(Vector<StackFrameStep> steps, List
                 for (StackFrameStep step : steps) {
                     stepIDJoiner.add(step.getId());
                 }
-                throw new CommCareSessionException(
+                log.error(
                     "Match Error: Steps " + stepIDJoiner.toString() +
                     " do not contain a valid option " + optionsIDJoiner.toString()
                 );