Skip to content

Commit c2bd753

Browse files
committed
Allow for null value setting on startDate and endDate for Memberships
1 parent 76a1b3b commit c2bd753

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/main/java/org/ecocean/servlet/MembershipCreate.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
102102
DateTime startDT = DateTime.parse(startDate, formatter);
103103
System.out.println("StartDate parsed: " + startDT.toString());
104104
Long startLong = startDT.getMillis();
105-
membership.setStartDate(startLong.longValue());
105+
membership.setStartDate(startLong);
106106
}
107+
else if(startDate == null) {membership.setStartDate(null);}
107108
if (endDate != null && !"".equals(endDate)) {
108109
DateTime endDT = DateTime.parse(endDate, formatter);
109110
System.out.println("EndDate parsed: " + endDT.toString());
110111
Long endLong = endDT.getMillis();
111-
membership.setEndDate(endLong.longValue());
112+
membership.setEndDate(endLong);
112113
}
114+
else if(endDate == null) {membership.setEndDate(null);}
113115
if (roleName != null) {
114116
if (roleName.trim().equals("")) {
115117
membership.setRole(null);

src/main/java/org/ecocean/social/Membership.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,15 @@ public void setRole(String role) {
103103
this.role = null;
104104
} else { this.role = role; }
105105
}
106-
107-
public void setStartDate(long startDate) {
108-
this.startDate = startDate;
106+
107+
public void setStartDate(Long startDate) {
108+
if(startDate==null) {this.startDate=null;}
109+
else{this.startDate = startDate;}
109110
}
110111

111-
public void setEndDate(long endDate) {
112-
this.endDate = endDate;
112+
public void setEndDate(Long endDate) {
113+
if(endDate==null) {this.endDate=null;}
114+
else{this.endDate = endDate;}
113115
}
114116

115117
public String getId() {

0 commit comments

Comments
 (0)