Skip to content
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

Check if resource is alive before using it in GWT module #199

Merged
merged 1 commit into from
Feb 29, 2012
Merged

Check if resource is alive before using it in GWT module #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions ...t/atmosphere-gwt-server/src/main/java/org/atmosphere/gwt/server/AtmosphereGwtHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void doPost(HttpServletRequest postRequest, HttpServletResponse postRespo
if (messages.size() == 1) {
cometResource.post(messages.get(0));
} else {
cometResource.post((List) messages);
cometResource.post(messages);
}
}

Expand Down Expand Up @@ -213,7 +213,7 @@ protected void doServerMessage(HttpServletRequest request, HttpServletResponse r
BufferedReader data = request.getReader();
List<Serializable> postMessages = new ArrayList<Serializable>();
GwtAtmosphereResource resource = lookupResource(connectionID);
if (resource == null) {
if (resource == null || !resource.isAlive()) {
return;
}
try {
Expand Down Expand Up @@ -298,7 +298,7 @@ final public void post(HttpServletRequest postRequest, HttpServletResponse postR
if (messages == null) {
return;
}
if (cometResource != null) {
if (cometResource != null && cometResource.isAlive()) {
doPost(postRequest, postResponse, messages, cometResource);
}
}
Expand All @@ -307,14 +307,16 @@ public void broadcast(Serializable message, GwtAtmosphereResource resource) {
if (message == null) {
return;
}
resource.getBroadcaster().broadcast(message);
if (resource.isAlive())
resource.getBroadcaster().broadcast(message);
}

public void broadcast(List<Serializable> messages, GwtAtmosphereResource resource) {
if (messages == null) {
return;
}
resource.getBroadcaster().broadcast(messages);
if (resource.isAlive())
resource.getBroadcaster().broadcast(messages);
}

public void disconnect(GwtAtmosphereResource resource) {
Expand Down