Check for null

Atmosphere · Nov 8, 2013 · 6cd13b2 · 6cd13b2
1 parent ab3fccd
commit 6cd13b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/cpr/src/main/java/org/atmosphere/websocket/DefaultWebSocketProcessor.java b/modules/cpr/src/main/java/org/atmosphere/websocket/DefaultWebSocketProcessor.java
@@ -254,7 +254,7 @@ protected WebSocketHandler postProcessMapping(WebSocket webSocket, AtmosphereReq
         }
 
         try {
-            webSocket.resource().setBroadcaster(AnnotationUtil.broadcaster(framework, p.broadcasterClazz, path));
+            webSocket.resource().setBroadcaster(AnnotationUtil.broadcaster(framework, p != null ? p.broadcasterClazz : w.broadcasterClazz, path));
         } catch (Exception e) {
             logger.error("", e);
         }