From 6cd13b29fe01239ffc3cf30aa714e163f141f56a Mon Sep 17 00:00:00 2001
From: jfarcand <jfarcand@apache.org>
Date: Fri, 8 Nov 2013 13:15:27 -0500
Subject: [PATCH] Check for null

---
 .../org/atmosphere/websocket/DefaultWebSocketProcessor.java     | 2 +-
 1 file changed, 1 insertion(+), 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
index d652c94898d..53051531415 100644
--- 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);
         }