Merge pull request #432 from deedee/dev

skyhit · web-flow · commit 221d3ebbed0c · 2018-06-27T10:51:01.000+08:00
NPE on ConstestServiceFacadeBean.getSoftwareContestByProjectId effortrtHoursEnabled
diff --git a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
@@ -5959,7 +5959,7 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo
             try {
                 Client client = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId());
                 if (client != null) {
-                    effortHoursEnabled = client.isEffortHoursEnabled();
+                    effortHoursEnabled = client.isEffortHoursEnabled() == null ? false : client.isEffortHoursEnabled();
                 }
 
             } catch (PersistenceFault e) {

Original file line number	Diff line number	Diff line change
`@@ -5959,7 +5959,7 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo`
`5959`	`5959`	`try {`
`5960`	`5960`	`Client client = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId());`
`5961`	`5961`	`if (client != null) {`
`5962`		`- effortHoursEnabled = client.isEffortHoursEnabled();`
	`5962`	`+ effortHoursEnabled = client.isEffortHoursEnabled() == null ? false : client.isEffortHoursEnabled();`
`5963`	`5963`	`}`
`5964`	`5964`
`5965`	`5965`	`} catch (PersistenceFault e) {`