S11104287 # Bugfixes + Warranty Issue List #Issue with Social Login - Null Pointer

cmsWebApp/src/performa/form/CompleteApplicationFP.java

@@ -25,7 +25,7 @@ public class CompleteApplicationFP extends SaveFP
         ObjectTransaction   objTran         =   ObjectTransaction.getTransaction();
         JobApplication      jobApplication  =   (JobApplication) process.getAttribute("JobApplication");
         
-        jobApplication  =   (JobApplication) jobApplication.getInTransaction (objTran);
+        jobApplication  =   jobApplication.getInTransaction (objTran) != null ? (JobApplication) jobApplication.getInTransaction (objTran) : jobApplication;
 
         jobApplication.setApplicationStatus(ApplicationStatus.SUBMITTED);
         jobApplication.setSubmittedDate(new Date());

cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp

@@ -186,7 +186,7 @@
             </div>
         </div>
     <%
-        if(job.getJobStatus() == JobStatus.OPEN && jobApplication.getApplicationStatus()!= ApplicationStatus.SUBMITTED)
+        if(job.getJobStatus() == JobStatus.OPEN && jobApplication.getApplicationStatus() == ApplicationStatus.DRAFT)
         {
             String  btnText =   "Resume the application";
 
@@ -240,7 +240,7 @@
         {
             String  infoStr =   "We're sorry, this job is no longer accepting applications";
 
-            if(jobApplication.getApplicationStatus() == ApplicationStatus.SUBMITTED)
+            if(jobApplication.getApplicationStatus() != ApplicationStatus.DRAFT)
             {
                 infoStr =   "You applied for this job on " + FormatUtils.stringify(jobApplication.getSubmittedDate(), "MidDate", "") ;
             }