Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit ed1e439

Browse files
authored
Merge branch 'dev' into feature/bad_request_group_api_issue#539
2 parents f659513 + 6d23464 commit ed1e439

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ workflows:
9191
filters:
9292
branches:
9393
only: [dev, dev-sts, 'feature/bad_request_group_api_issue#539']
94+
9495
- build-qa:
9596
context : org-global
9697
filters:

components/project_management/src/java/main/com/topcoder/management/project/ProjectGroup.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,20 @@
2222
* <p>
2323
* Changes related to v5-groups-api
2424
* </p>
25-
*
26-
* @author dushyantb
27-
* @version 1.1
25+
* Version 1.2 (Fixing serilization error for ProjectGroup):
26+
* <ul>
27+
* <li>Added serlization version id to avoid marshlling errors</li>
28+
* </ul>
29+
* @author dushyantb, vikasrohit
30+
* @version 1.2
2831
*/
2932

3033
public class ProjectGroup implements Serializable {
34+
/**
35+
* Unique seriliazation version id
36+
*/
37+
private static final long serialVersionUID = 652485342267757690L;
38+
3139
/**
3240
* Represents group id
3341
*/

services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4061,7 +4061,6 @@ else if (isDevContest) {
40614061
} else {
40624062
if(isPrivateProject(contest)) { // no forum to be created for private tasks
40634063
logger.debug("Skip forum creation for private task: "+assetDTO.getName());
4064-
forumId = -1;
40654064
} else {
40664065
if (!isStudio(contest)) {
40674066
// software contest
@@ -4224,10 +4223,8 @@ else if (isDevContest) {
42244223
// "0");
42254224
// }
42264225

4227-
if (forumId > 0) {
4228-
contest.getProjectHeader().setProperty(ProjectPropertyType.DEVELOPER_FORUM_ID_PROJECT_PROPERTY_KEY,
4226+
contest.getProjectHeader().setProperty(ProjectPropertyType.DEVELOPER_FORUM_ID_PROJECT_PROPERTY_KEY,
42294227
String.valueOf(forumId));
4230-
}
42314228

42324229
contest.getProjectPhases().setStartDate(getDate(productionDate));
42334230
}
@@ -5988,7 +5985,7 @@ private long createStudioForum(String name, long userId) {
59885985
logger.error("*** Could not create a studio forum for " + name);
59895986
logger.error(e);
59905987
}
5991-
return -1;
5988+
return 0;
59925989
}
59935990

59945991
/**
@@ -6036,7 +6033,7 @@ public long createForum(TCSubject tcSubject, AssetDTO asset, long userId, long p
60366033
logger.error("*** Could not create a forum for " + asset.getName());
60376034
logger.error(e);
60386035

6039-
return forumId;
6036+
return 0;
60406037
}
60416038
}
60426039

@@ -7759,10 +7756,8 @@ else if (autoDevCreating && isDevContest) {
77597756
dto.getForum().setCompVersion(null);
77607757
}
77617758

7762-
if (forumId > 0) {
7763-
contest.getProjectHeader().setProperty(ProjectPropertyType.DEVELOPER_FORUM_ID_PROJECT_PROPERTY_KEY,
7759+
contest.getProjectHeader().setProperty(ProjectPropertyType.DEVELOPER_FORUM_ID_PROJECT_PROPERTY_KEY,
77647760
String.valueOf(forumId));
7765-
}
77667761

77677762
contest.setStartDate(getDate(startDate));
77687763
// 3.create the project

0 commit comments

Comments
 (0)