Permalink
Browse files

Make sure the new Broadcaster i snot null

  • Loading branch information...
1 parent 03fefd1 commit aa90e3f3a3cfce7f8203c5671e4fdef23748889e @jfarcand jfarcand committed Jun 7, 2011
Showing with 3 additions and 1 deletion.
  1. +3 −1 modules/jersey/src/main/java/org/atmosphere/jersey/AtmosphereFilter.java
@@ -362,7 +362,9 @@ void broadcast(ContainerResponse r, AtmosphereResource ar, long delay) {
String returnMsg = null;
// Something went wrong if null.
if (o instanceof Broadcastable) {
- b = ((Broadcastable) o).getBroadcaster();
+ if (((Broadcastable) o).getBroadcaster() != null) {
+ b = ((Broadcastable) o).getBroadcaster();
+ }
msg = ((Broadcastable) o).getMessage();
returnMsg = ((Broadcastable) o).getResponseMessage().toString();
}

0 comments on commit aa90e3f

Please sign in to comment.