Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-12-17 17:32:59 -0500
committerJoakim Erdfelt2015-12-17 17:32:59 -0500
commit60d09bc958a97c91518fa0ee5859b47591e6f6f9 (patch)
tree5adedc36b12c4a86766707f387e9730908c5174d /jetty-websocket
parenta4cf7d654bf839129d0cb0e9c5bf7f2585e5afe6 (diff)
parent9908910c3b663e08d618722597f8a8d0d23e970c (diff)
downloadorg.eclipse.jetty.project-60d09bc958a97c91518fa0ee5859b47591e6f6f9.tar.gz
org.eclipse.jetty.project-60d09bc958a97c91518fa0ee5859b47591e6f6f9.tar.xz
org.eclipse.jetty.project-60d09bc958a97c91518fa0ee5859b47591e6f6f9.zip
Merge branch 'jetty-9.3.x'
Diffstat (limited to 'jetty-websocket')
-rw-r--r--jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrPongMessage.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrPongMessage.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrPongMessage.java
index 961329a113..e3458b7762 100644
--- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrPongMessage.java
+++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrPongMessage.java
@@ -22,6 +22,8 @@ import java.nio.ByteBuffer;
import javax.websocket.PongMessage;
+import org.eclipse.jetty.util.BufferUtil;
+
public class JsrPongMessage implements PongMessage
{
private final ByteBuffer data;
@@ -34,6 +36,10 @@ public class JsrPongMessage implements PongMessage
@Override
public ByteBuffer getApplicationData()
{
+ if (data == null)
+ {
+ return BufferUtil.EMPTY_BUFFER;
+ }
return data.slice();
}
}

Back to the top