Finish Hotfix-20180208

cmsWebApp/src/performa/form/SaveJobFP.java

@@ -27,7 +27,7 @@ public class SaveJobFP extends SaveFP
     public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
     {
         HttpServletRequest  request =   submission.getRequest();
-        Job                 job     =   process.getAttribute("Job") != null ? (Job) process.getAttribute("Job") : (Job) request.getAttribute("Job");
+        Job                 job     =   request.getAttribute("Job") != null ? (Job) request.getAttribute("Job") : (Job) process.getAttribute("Job");
         JobStatus           status  =   (JobStatus) request.getAttribute("JobStatus");
         
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );

cmsWebApp/src/performa/orm/JobApplication.java

@@ -337,7 +337,7 @@ public class JobApplication extends BaseJobApplication
         Filter                          filter                  =   AssessmentCriteria.SearchByAll().andImportance(new EqualsFilter<>(Importance.ESSENTIAL));   
         Collection<AssessmentCriteria>  essentialRequirements   =   CollectionFilter.filter(getJob().getAssessmentCriteriasSet(), filter);
         
-        if(essentialRequirements.size() > 0)
+        if(essentialRequirements.size() > 0 && getRequirementAnswersByImportance().getValuesForKey(Importance.ESSENTIAL) != null)
         {
             Filter  negativeFilter  =   AssessmentCriteriaAnswer.SearchByAll().andAnswer(new EqualsFilter<>(Boolean.FALSE));