From 9d2968d781b8e8e6373857cf682b8b2f9ab9e7a1 Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Tue, 10 Jul 2012 08:55:15 -0500
Subject: [PATCH] null check on payload

---
 .../eclipse/jetty/websocket/protocol/WebSocketFrame.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
index 4d70c5ddb4c..d232d608e2e 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java
@@ -132,7 +132,14 @@ public class WebSocketFrame implements Frame
     @Override
     public ByteBuffer getPayload()
     {
-        return data.slice();
+        if (data != null)
+        {
+            return data.slice();
+        }
+        else
+        {
+            return null;
+        }
     }
 
     public String getPayloadAsUTF8()