Skip to content

Stop waiting for the messages once its session was destroyed, Simplified code. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2017
Merged

Stop waiting for the messages once its session was destroyed, Simplified code. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7caa42d
Stop waiting for the messages once its session was destroyed
m0ver Jan 20, 2017
1cd5a79
Simplified the code
m0ver Jan 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/tinystruct/examples/smalltalk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,20 +211,18 @@ public String update() throws ApplicationException, IOException {
}

public String update(String meetingCode, String sessionId) throws ApplicationException, IOException {
String error = "{ \"error\": \"expired\" }";
if (this.meetings.containsKey(meetingCode)) {
if(sessions.get(meetingCode) != null && sessions.get(meetingCode).contains(sessionId)) {
return this.update(sessionId);
}
final HttpServletResponse response = (HttpServletResponse) this.context.getAttribute("HTTP_RESPONSE");
response.setContentType("application/json");
response.setStatus(403);
return "{ \"error\": \"session-timeout\" }";
error = "{ \"error\": \"session-timeout\" }";
}

final HttpServletResponse response = (HttpServletResponse) this.context.getAttribute("HTTP_RESPONSE");
response.setContentType("application/json");
response.setStatus(403);
return "{ \"error\": \"expired\" }";
return error;
}

public String upload() throws ApplicationException {
Expand Down Expand Up @@ -329,19 +327,19 @@ public void sessionDestroyed(HttpSessionEvent arg0) {
builder.put("time", format.format(new Date()));
builder.put("cmd", "expired");
this.save(meetingCode, builder);

Queue<Builder> messages;
List<String> session_ids;
synchronized (meetings) {
synchronized (this.meetings) {
if((session_ids = this.sessions.get(meetingCode)) != null) {
session_ids.remove(arg0.getSession().getId());
}
if ((messages = meetings.get(meetingCode)) != null) {

if ((messages = this.meetings.get(meetingCode)) != null) {
messages.remove(meetingCode);
}
meetings.notifyAll();

this.meetings.notifyAll();
}

synchronized (this.list) {
Expand Down
6 changes: 3 additions & 3 deletions src/tinystruct/examples/talk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,19 @@ public void run() {
* @throws IOException
*/
public final String update(final String sessionId) throws ApplicationException, IOException {
Builder message;
Builder message = null;
Queue<Builder> messages;
synchronized (this.list) {
messages = this.list.get(sessionId);
while((message = messages.poll()) == null) {
while(messages != null && (message = messages.poll()) == null) {
try {
this.list.wait(TIMEOUT);
} catch (InterruptedException e) {
throw new ApplicationException(e.getMessage(), e);
}
}

return message.toString();
return message != null ? message.toString() : "";
}
}

Expand Down